From 79fdc7831d2039b4c59954c8845df622d9360e9e Mon Sep 17 00:00:00 2001 From: Dmitri Gribenko Date: Tue, 2 Feb 2016 15:04:16 -0800 Subject: [PATCH] build-script: force LLVM to use libc++ on Darwin rdar://problem/24452118 --- utils/build-script-impl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/build-script-impl b/utils/build-script-impl index 39bd346a8c097..72be36f55164b 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -394,6 +394,7 @@ function set_deployment_target_based_options() { -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="${cmake_osx_deployment_target}" -DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)" -DLLVM_HOST_TRIPLE:STRING="${llvm_host_triple}" + -DLLVM_ENABLE_LIBCXX:BOOL=TRUE ) swift_cmake_options=( "${swift_cmake_options[@]}" @@ -401,6 +402,7 @@ function set_deployment_target_based_options() { -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS="${DARWIN_DEPLOYMENT_VERSION_IOS}" -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS="${DARWIN_DEPLOYMENT_VERSION_TVOS}" -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS="${DARWIN_DEPLOYMENT_VERSION_WATCHOS}" + -DLLVM_ENABLE_LIBCXX:BOOL=TRUE ) if [[ "${llvm_target_arch}" ]] ; then