From: Kuba Brecka Date: Mon, 14 Nov 2016 22:38:57 +0000 (+0000) Subject: [sanitizer] Passthrough CMAKE_OSX_DEPLOYMENT_TARGET when building compiler-rt from... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ef126f3b06d5680aa7cd37fdc59e2b36ac2bd4a;p=clang [sanitizer] Passthrough CMAKE_OSX_DEPLOYMENT_TARGET when building compiler-rt from clang/runtime/CMakeLists.txt This breaks some Swift builds, because Swift's build scripts explicitly set CMAKE_OSX_DEPLOYMENT_TARGET. This however isn't propagated to the compiler-rt build, causing build errors. Differential Revision: https://reviews.llvm.org/D26558 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@286898 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 1f0b2d9c27..896a3abff1 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -77,6 +77,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} + -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} ${COMPILER_RT_PASSTHROUGH_VARIABLES} INSTALL_COMMAND "" STEP_TARGETS configure build