diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tools/llvm-config/CMakeLists.txt | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 90586fb..0a4f88d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,10 +153,6 @@ else(WIN32) endif(UNIX) endif(WIN32) -if( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config ) - set(HAVE_LLVM_CONFIG 1) -endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config ) - include(config-ix) option(LLVM_ENABLE_PIC "Build Position-Independent Code" OFF) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1273c25..5dcfeba 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -2,9 +2,7 @@ # large and three small executables. This is done to minimize memory load # in parallel builds. Please retain this ordering. -# FIXME: We don't yet have the ability to build llvm-config with CMake -# based on explicit dependencies. -if (FALSE) +if( NOT MSVC ) add_subdirectory(llvm-config) endif() diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index 2cfd6bb..3d3262f 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt @@ -103,7 +103,6 @@ add_custom_command(OUTPUT ${LLVM_CONFIG} COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG} COMMAND chmod +x ${LLVM_CONFIG} - COMMAND cd ${CMAKE_BINARY_DIR} && ${CMAKE_COMMAND} -U HAVE_LLVM_CONFIG -D LLVM_BINARY_DIR="${LLVM_BINARY_DIR}" ${CMAKE_SOURCE_DIR} DEPENDS ${FINAL_LIBDEPS} ${LLVM_CONFIG_IN} COMMENT "Building llvm-config script." ) |