From cc8a94565ec2ff459dcee9ef34237fdcdfc69b3f Mon Sep 17 00:00:00 2001
From: Dylan Noblesmith <nobled@dreamwidth.org>
Date: Tue, 14 Feb 2012 15:54:49 +0000
Subject: [PATCH] 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
---
CMakeLists.txt | 2 +-
lib/Driver/Driver.cpp | 7 ++-----
lib/Driver/ToolChains.cpp | 6 +-----
lib/Frontend/InitHeaderSearch.cpp | 5 +----
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2087c6a8a71..bb92fee75b4 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 26ceb32e73e..b494ed12396 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 8c7158f0bff..703c7aa3d52 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 67b2287604d..ee4b4eb5cd3 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;
--
GitLab