Skip to content

Commit 6c3dc31

Browse files
committed
[build-script] Make sure that we build using an external compiler-rt on /all/ platforms, not just OS X.
This is important for a few reasons: 1. It ensures that on all platforms we use the just built clang to compile compiler-rt. This ensures that the clang used to compiler-rt has all of the features necessary to compile compiler-rt in the face of changes in the underlying implementation. 2. It ensures that all platforms build compiler-rt in the same manner.
1 parent ebbc643 commit 6c3dc31

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

utils/build-script-impl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,8 +628,6 @@ function set_build_options_for_host() {
628628
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="${cmake_osx_deployment_target}"
629629
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
630630
-DLLVM_ENABLE_LIBCXX:BOOL=TRUE
631-
-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
632-
-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
633631
-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE
634632
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
635633
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
@@ -675,6 +673,11 @@ function set_build_options_for_host() {
675673
;;
676674
esac
677675

676+
llvm_cmake_options+=(
677+
-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
678+
-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
679+
)
680+
678681
if [[ "${llvm_target_arch}" ]] ; then
679682
llvm_cmake_options+=(
680683
-DLLVM_TARGET_ARCH="${llvm_target_arch}"

0 commit comments

Comments
 (0)