diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-07-16 18:10:12 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-07-16 18:10:12 +0000 |
| commit | da2d5cbe5f63d1464a4ac8f128ea5b68b85aee94 (patch) | |
| tree | 3d6054e179bc2063d8038adeef77fbe0770d0d2f | |
| parent | 35888f0ee8ec040a77d8d1e8cb82d812281dee7f (diff) | |
| download | compiler-rt-da2d5cbe5f63d1464a4ac8f128ea5b68b85aee94.tar.gz | |
Merging r242424:
------------------------------------------------------------------------
r242424 | samsonov | 2015-07-16 10:53:01 -0700 (Thu, 16 Jul 2015) | 11 lines
[CMake] Workaround for PR24144: avoid installing libcxx_tsan and libcxx_msan by default "ninja install" command.
Summary:
Exclude external libc++ builds from "all" target, so that they are only
build on demand, and are not installed together with LLVM/Clang.
Reviewers: hans
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D11252
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_37@242425 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 52cbe35dd..ab155bf45 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -245,6 +245,7 @@ macro(add_custom_libcxx name prefix) list(APPEND LIBCXX_DEPS clang) endif() + set(EXCLUDE_FROM_ALL TRUE) ExternalProject_Add(${name} PREFIX ${prefix} SOURCE_DIR ${COMPILER_RT_LIBCXX_PATH} @@ -271,4 +272,5 @@ macro(add_custom_libcxx name prefix) DEPENDERS configure DEPENDS ${LIBCXX_DEPS} ) + set(EXCLUDE_FROM_ALL FALSE) endmacro() |