diff options
| -rw-r--r-- | clang/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | clang/include/clang/Config/config.h.cmake | 3 | ||||
| -rw-r--r-- | clang/include/clang/Config/config.h.in | 5 | ||||
| -rw-r--r-- | clang/lib/Basic/Version.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 5 |
5 files changed, 5 insertions, 15 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 28f4e3f..ece6bf8 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -156,9 +156,6 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) endif() set( CLANG_BUILT_STANDALONE 1 ) - set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}") -else() - set(BACKEND_PACKAGE_STRING "${PACKAGE_STRING}") endif() find_package(LibXml2) diff --git a/clang/include/clang/Config/config.h.cmake b/clang/include/clang/Config/config.h.cmake index 40a6cb3..8fa7a52 100644 --- a/clang/include/clang/Config/config.h.cmake +++ b/clang/include/clang/Config/config.h.cmake @@ -19,7 +19,4 @@ /* Define if we have libxml2 */ #cmakedefine CLANG_HAVE_LIBXML ${CLANG_HAVE_LIBXML} -/* The LLVM product name and version */ -#define BACKEND_PACKAGE_STRING "${BACKEND_PACKAGE_STRING}" - #endif diff --git a/clang/include/clang/Config/config.h.in b/clang/include/clang/Config/config.h.in index 450ea9b..d66b4cf 100644 --- a/clang/include/clang/Config/config.h.in +++ b/clang/include/clang/Config/config.h.in @@ -22,9 +22,4 @@ /* Define if we have libxml2 */ #undef CLANG_HAVE_LIBXML -#undef PACKAGE_STRING - -/* The LLVM product name and version */ -#define BACKEND_PACKAGE_STRING PACKAGE_STRING - #endif diff --git a/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp index c2b7753..ae32c01 100644 --- a/clang/lib/Basic/Version.cpp +++ b/clang/lib/Basic/Version.cpp @@ -13,7 +13,7 @@ #include "clang/Basic/Version.h" #include "clang/Basic/LLVM.h" -#include "clang/Config/config.h" +#include "llvm/Config/config.h" #include "llvm/Support/raw_ostream.h" #include <cstdlib> #include <cstring> @@ -130,7 +130,7 @@ std::string getClangToolFullVersion(StringRef ToolName) { // If vendor supplied, include the base LLVM version as well. #ifdef CLANG_VENDOR - OS << " (based on " << BACKEND_PACKAGE_STRING << ")"; + OS << " (based on LLVM " << PACKAGE_VERSION << ")"; #endif return OS.str(); diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index f5e2749..a967c0a 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -16,7 +16,6 @@ #include "clang/Basic/SourceManager.h" #include "clang/Basic/TargetInfo.h" #include "clang/Basic/Version.h" -#include "clang/Config/config.h" #include "clang/Frontend/ChainedDiagnosticConsumer.h" #include "clang/Frontend/FrontendAction.h" #include "clang/Frontend/FrontendActions.h" @@ -710,7 +709,9 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) { // Validate/process some options. if (getHeaderSearchOpts().Verbose) OS << "clang -cc1 version " CLANG_VERSION_STRING - << " based upon " << BACKEND_PACKAGE_STRING +#ifdef PACKAGE_STRING + << " based upon " << PACKAGE_STRING +#endif << " default target " << llvm::sys::getDefaultTargetTriple() << "\n"; if (getFrontendOpts().ShowTimers) |