diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-14 15:54:49 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-14 15:54:49 +0000 |
| commit | cc8a94565ec2ff459dcee9ef34237fdcdfc69b3f (patch) | |
| tree | 535f50ac6e4fb89c5bb6c127e11af38074c098cc | |
| parent | 14c598268ff7534d3753ae84eba9b8a81bf0bf8f (diff) | |
include clang's config.h unconditionally (v2)
And remove HAVE_CLANG_CONFIG_H, now that the header is generated
in the autoconf build, too.
Reverts r149571/restores r149504, now that config.h is generated
correctly by LLVM's configure in all build configurations.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150487 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 7 | ||||
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 6 | ||||
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 5 |
4 files changed, 5 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2087c6a8a7..bb92fee75b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,7 +234,7 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ PATTERN "*.inc" ) -add_definitions( -D_GNU_SOURCE -DHAVE_CLANG_CONFIG_H ) +add_definitions( -D_GNU_SOURCE ) # Clang version information set(CLANG_EXECUTABLE_VERSION diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 26ceb32e73..b494ed1239 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -36,13 +36,10 @@ #include "InputInfo.h" #include "ToolChains.h" -#ifdef HAVE_CLANG_CONFIG_H -# include "clang/Config/config.h" -#endif -#include "llvm/Config/config.h" - #include <map> +#include "clang/Config/config.h" + using namespace clang::driver; using namespace clang; diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 8c7158f0bf..703c7aa3d5 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -33,11 +33,7 @@ #include <cstdlib> // ::getenv -#ifdef HAVE_CLANG_CONFIG_H -# include "clang/Config/config.h" -#endif - -#include "llvm/Config/config.h" // for GCC_INSTALL_PREFIX +#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX using namespace clang::driver; using namespace clang::driver::toolchains; diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 67b2287604..ee4b4eb5cd 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -26,11 +26,8 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Path.h" -#ifdef HAVE_CLANG_CONFIG_H -# include "clang/Config/config.h" -#endif +#include "clang/Config/config.h" // C_INCLUDE_DIRS -#include "llvm/Config/config.h" using namespace clang; using namespace clang::frontend; |