Fix cmake for r136702 (at least for the most part).  Chandler has been kind 
enough to offer to investigate the underlying issue.  Thanks to Doug for his
assistance as well.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136719 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ad60ea..2be3c9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -272,3 +272,6 @@
     file(APPEND "${CLANG_SLN_FILENAME}" "\n# This should be regenerated!\n")
   endif()
 endif()
+
+set(BUG_REPORT_URL "http://llvm.org/bugs/" CACHE STRING
+  "Default URL where bug reports are to be submitted.")
diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
index d70a151..c53e5eb 100644
--- a/include/clang/Config/config.h.cmake
+++ b/include/clang/Config/config.h.cmake
@@ -15,3 +15,6 @@
 
 /* Directories clang will search for headers. */
 #define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"
+
+/* Define default bug reporting URL. */
+#define BUG_REPORT_URL "${BUG_REPORT_URL}"
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index 9ecfb7c..fc2ec67 100644
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -373,8 +373,8 @@
 void Driver::generateCompilationDiagnostics(Compilation &C,
                                             const Command *FailingCommand) {
   Diag(clang::diag::note_drv_command_failed_diag_msg)
-    << "Please submit a bug report and include command line arguments and "
-    "all diagnostic information.";
+    << "Please submit a bug report to " BUG_REPORT_URL " and include command"
+    " line arguments and all diagnostic information.";
 
   // Suppress driver output and emit preprocessor output to temp file.
   CCCIsCPP = true;