Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-08 09:03:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

include clang's config.h unconditionally (v2)

Browse Source 
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
This commit is contained in:
Dylan Noblesmith 2012-02-14 15:54:49 +00:00
parent 1deda29598
commit 4d9cbffbe2
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/CMakeLists.txt
View File

@ -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

7
clang/lib/Driver/Driver.cpp
View File

@ -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;

6
clang/lib/Driver/ToolChains.cpp
View File

@ -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;

5
clang/lib/Frontend/InitHeaderSearch.cpp
View File

@ -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;