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 | 4d9cbffbe2cfa22013e84575375d4823fc817cf2 (patch) | |
| tree | 06716b8b622332e47206b2ea78675bb0263e024b | |
| parent | 1deda29598f7e223ce7546b5a7c95120160bbe9d (diff) | |
| download | bcm5719-llvm-4d9cbffbe2cfa22013e84575375d4823fc817cf2.tar.gz bcm5719-llvm-4d9cbffbe2cfa22013e84575375d4823fc817cf2.zip | |
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.
llvm-svn: 150487
| -rw-r--r-- | clang/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/Frontend/InitHeaderSearch.cpp | 5 |
4 files changed, 5 insertions, 15 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 2087c6a8a71..bb92fee75b4 100644 --- a/clang/CMakeLists.txt +++ b/clang/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/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 26ceb32e73e..b494ed12396 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/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/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 8c7158f0bff..703c7aa3d52 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/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/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp index 67b2287604d..ee4b4eb5cd3 100644 --- a/clang/lib/Frontend/InitHeaderSearch.cpp +++ b/clang/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; |
