aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOscar Fuentes <ofv@wanadoo.es>2011-02-03 22:47:59 +0000
committerOscar Fuentes <ofv@wanadoo.es>2011-02-03 22:47:59 +0000
commitd931dca6e57cf9ceb4ceb04c23debe93e96eb7f9 (patch)
tree43f4b039a81a7f378621c742bd2784ecc19d1816
parent0ecd2964214374045e699e3dc58c9093d9686293 (diff)
downloadexternal_llvm-d931dca6e57cf9ceb4ceb04c23debe93e96eb7f9.zip
external_llvm-d931dca6e57cf9ceb4ceb04c23debe93e96eb7f9.tar.gz
external_llvm-d931dca6e57cf9ceb4ceb04c23debe93e96eb7f9.tar.bz2
Moved to Clang's source tree its configuration options and associated
macros. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@124824 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--CMakeLists.txt6
-rw-r--r--include/llvm/Config/config.h.cmake18
2 files changed, 0 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaf6e9c..e436c1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,9 +101,6 @@ else( MSVC )
CACHE STRING "Semicolon-separated list of targets to build, or \"all\".")
endif( MSVC )
-set(CLANG_RESOURCE_DIR "" CACHE STRING
- "Relative directory from the Clang binary to its resource files.")
-
option(LLVM_ENABLE_CBE_PRINTF_A "Set to ON if CBE is enabled for printf %a output" ON)
if(LLVM_ENABLE_CBE_PRINTF_A)
set(ENABLE_CBE_PRINTF_A 1)
@@ -118,9 +115,6 @@ option(LLVM_ENABLE_FFI "Use libffi to call external functions from the interpret
set(FFI_LIBRARY_DIR "" CACHE PATH "Additional directory, where CMake should search for libffi.so")
set(FFI_INCLUDE_DIR "" CACHE PATH "Additional directory, where CMake should search for ffi.h or ffi/ffi.h")
-set(C_INCLUDE_DIRS "" CACHE STRING
- "Colon separated list of directories clang will search for headers.")
-
set(LLVM_TARGET_ARCH "host"
CACHE STRING "Set target to use for LLVM JIT or use \"host\" for automatic detection.")
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index a088c7c..12e10ce 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -5,24 +5,6 @@
#ifndef CONFIG_H
#define CONFIG_H
-/* Relative directory for resource files */
-#define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}"
-
-/* 32 bit multilib directory. */
-#define CXX_INCLUDE_32BIT_DIR "${CXX_INCLUDE_32BIT_DIR}"
-
-/* 64 bit multilib directory. */
-#define CXX_INCLUDE_64BIT_DIR "${CXX_INCLUDE_64BIT_DIR}"
-
-/* Arch the libstdc++ headers. */
-#define CXX_INCLUDE_ARCH "${CXX_INCLUDE_ARCH}"
-
-/* Directory with the libstdc++ headers. */
-#define CXX_INCLUDE_ROOT "${CXX_INCLUDE_ROOT}"
-
-/* Directories clang will search for headers */
-#define C_INCLUDE_DIRS "${C_INCLUDE_DIRS}"
-
/* Define if CBE is enabled for printf %a output */
#cmakedefine ENABLE_CBE_PRINTF_A ${ENABLE_CBE_PRINTF_A}