diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-02 00:40:14 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-02-02 00:40:14 +0000 |
| commit | 4f4e745725c01c18210a9dd22fc32420aaf81d1f (patch) | |
| tree | a437ae45c5db3d172d604e9195fb839127ae480b /clang/lib/Driver | |
| parent | 7f977de4e9a6c9c99819a89ab199ad02238cc0fa (diff) | |
| download | bcm5719-llvm-4f4e745725c01c18210a9dd22fc32420aaf81d1f.tar.gz bcm5719-llvm-4f4e745725c01c18210a9dd22fc32420aaf81d1f.zip | |
back out r149504
Too many weird build failures.
llvm-svn: 149571
Diffstat (limited to 'clang/lib/Driver')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 7 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains.cpp | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 5248c2e7703..89e06002a2b 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -36,9 +36,12 @@ #include "InputInfo.h" #include "ToolChains.h" -#include <map> +#ifdef HAVE_CLANG_CONFIG_H +# include "clang/Config/config.h" +#endif +#include "llvm/Config/config.h" -#include "clang/Config/config.h" +#include <map> using namespace clang::driver; using namespace clang; diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 0f00f0b79ef..0c8d3dc82e4 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -33,7 +33,11 @@ #include <cstdlib> // ::getenv -#include "clang/Config/config.h" +#ifdef HAVE_CLANG_CONFIG_H +# include "clang/Config/config.h" +#endif + +#include "llvm/Config/config.h" // for CXX_INCLUDE_ROOT using namespace clang::driver; using namespace clang::driver::toolchains; |
