Commit 9613d173 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r242444: 

------------------------------------------------------------------------
r242444 | samsonov | 2015-07-16 14:20:05 -0700 (Thu, 16 Jul 2015) | 3 lines

[CMake] One more attempt to fix PR24144.

This time, exclude ExternalProject from build using set_target_properties.
------------------------------------------------------------------------

llvm-svn: 242445
parent 52017d6f

compiler-rt/cmake/Modules/AddCompilerRT.cmake

+1 −2
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ 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}
@@ -259,6 +258,7 @@ macro(add_custom_libcxx name prefix) 
    LOG_CONFIGURE 1

    LOG_INSTALL 1

    )

  set_target_properties(${name} PROPERTIES EXCLUDE_FROM_ALL TRUE)



  ExternalProject_Add_Step(${name} force-reconfigure

    DEPENDERS configure
@@ -272,5 +272,4 @@ macro(add_custom_libcxx name prefix) 
    DEPENDERS configure

    DEPENDS ${LIBCXX_DEPS}

    )

  set(EXCLUDE_FROM_ALL FALSE)

endmacro()