diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 19:59:35 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 19:59:35 +0000 |
| commit | 1ad92131abbed3d2992d5996969274a8e1ae9a6b (patch) | |
| tree | 773ce7f5c949f85879d65bb5f26620ba6e9ed587 /tools/CMakeLists.txt | |
| parent | 0ad62be9aa54c4e4670af758c37c2d0673bc67e4 (diff) | |
| download | llvm-1ad92131abbed3d2992d5996969274a8e1ae9a6b.tar.gz llvm-1ad92131abbed3d2992d5996969274a8e1ae9a6b.tar.bz2 llvm-1ad92131abbed3d2992d5996969274a8e1ae9a6b.tar.xz | |
Revert r144300 "llvm-config: Replace with C++ version (was llvm-config-2).",
which didn't appear ready for prime time.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144309 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/CMakeLists.txt')
| -rw-r--r-- | tools/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 46d08a4b17..28b36dcdfd 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -11,9 +11,16 @@ if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/polly/CMakeLists.txt ) endif( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/polly/CMakeLists.txt ) if( NOT WIN32 OR MSYS OR CYGWIN ) - # We currently require 'sed' to build llvm-config, so don't try to build it on - # pure Win32. + # 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) + + # We currently require 'sed' to build llvm-config-2, so don't try to build it + # on pure Win32. + add_subdirectory(llvm-config-2) endif() add_subdirectory(opt) |