[cfe-commits] r149571 - in /cfe/trunk: CMakeLists.txt lib/Driver/Driver.cpp lib/Driver/ToolChains.cpp lib/Frontend/InitHeaderSearch.cpp

[Dylan Noblesmith]

Author: nobled
Date: Wed Feb  1 18:40:14 2012
New Revision: 149571

URL: http://llvm.org/viewvc/llvm-project?rev=149571&view=rev
Log:
back out r149504

Too many weird build failures.


Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/lib/Driver/Driver.cpp
    cfe/trunk/lib/Driver/ToolChains.cpp
    cfe/trunk/lib/Frontend/InitHeaderSearch.cpp

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=149571&r1=149570&r2=149571&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Wed Feb  1 18:40:14 2012
@@ -234,7 +234,7 @@
   PATTERN "*.inc"
   )
 
-add_definitions( -D_GNU_SOURCE )
+add_definitions( -D_GNU_SOURCE -DHAVE_CLANG_CONFIG_H )
 
 # Clang version information
 set(CLANG_EXECUTABLE_VERSION

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=149571&r1=149570&r2=149571&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Wed Feb  1 18:40:14 2012
@@ -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;

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=149571&r1=149570&r2=149571&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Wed Feb  1 18:40:14 2012
@@ -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;

Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=149571&r1=149570&r2=149571&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Wed Feb  1 18:40:14 2012
@@ -26,8 +26,11 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Path.h"
 
-#include "clang/Config/config.h"
+#ifdef HAVE_CLANG_CONFIG_H
+# include "clang/Config/config.h"
+#endif
 
+#include "llvm/Config/config.h"
 using namespace clang;
 using namespace clang::frontend;