[llvm-branch-commits] [compiler-rt-branch] r242425 - Merging r242424:

[Hans Wennborg]

Author: hans
Date: Thu Jul 16 13:10:12 2015
New Revision: 242425

URL: http://llvm.org/viewvc/llvm-project?rev=242425&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_37/   (props changed)
    compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake

Propchange: compiler-rt/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 13:10:12 2015
@@ -1 +1 @@
-/compiler-rt/trunk:242350
+/compiler-rt/trunk:242350,242424

Modified: compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake?rev=242425&r1=242424&r2=242425&view=diff
==============================================================================
--- compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/branches/release_37/cmake/Modules/AddCompilerRT.cmake Thu Jul 16 13:10:12 2015
@@ -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()