diff options
author | Roman Divacky <rdivacky@FreeBSD.org> | 2009-10-14 17:57:32 +0000 |
---|---|---|
committer | Roman Divacky <rdivacky@FreeBSD.org> | 2009-10-14 17:57:32 +0000 |
commit | 59850d0874429601812bc13408cb1f776649027c (patch) | |
tree | b21f6de4e08b89bb7931806bab798fc2a5e3a686 /tools/CMakeLists.txt | |
parent | 18f153bdb9db52e7089a2d5293b96c45a3124a26 (diff) | |
download | src-59850d0874429601812bc13408cb1f776649027c.tar.gz src-59850d0874429601812bc13408cb1f776649027c.zip |
Update llvm to r84119.vendor/llvm/llvm-r84119
Notes
Notes:
svn path=/vendor/llvm/dist/; revision=198090
svn path=/vendor/llvm/llvm-84119/; revision=198091; tag=vendor/llvm/llvm-r84119
Diffstat (limited to 'tools/CMakeLists.txt')
-rw-r--r-- | tools/CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 1273c25cd79e..8b5d77e2c42d 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -2,10 +2,13 @@ # 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) - add_subdirectory(llvm-config) +if( NOT WIN32 OR MSYS OR CYGWIN ) + # It is useful to build llvm-config before the other tools, so we + # have a fresh LibDeps.txt for regenerating the hard-coded library + # dependencies. llvm-config/CMakeLists.txt takes care of this but we + # must keep llvm-config as the first entry on the list of tools to + # be built. + add_subdirectory(llvm-config) endif() add_subdirectory(opt) @@ -23,11 +26,7 @@ add_subdirectory(llvm-prof) add_subdirectory(llvm-link) add_subdirectory(lli) -# gccas and gccld are deprecated: -# add_subdirectory(gccas) -# add_subdirectory(gccld) add_subdirectory(llvm-extract) -add_subdirectory(llvm-db) add_subdirectory(bugpoint) add_subdirectory(llvm-bcanalyzer) @@ -37,3 +36,5 @@ add_subdirectory(llvmc) if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt ) add_subdirectory( ${CMAKE_CURRENT_SOURCE_DIR}/clang ) endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/clang/CMakeLists.txt ) + +set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE) |