Skip to content

Commit 7256fcb

Browse files
committed
[build-script-impl] Expose the --skip-build-compiler-rt flag.
This was already in build-script-impl in the guise of SKIP_COMPILER_RT. This just makes the name canonical (i.e. SKIP_BUILD_COMPILER_RT) and also exposes it via build-script-impl's interface.
1 parent 911dfa8 commit 7256fcb

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

utils/build-script-impl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ KNOWN_SETTINGS=(
110110
swift-primary-variant-arch "" "default arch for target binaries"
111111
skip-build-cmark "" "set to skip building CommonMark"
112112
skip-build-llvm "" "set to skip building LLVM/Clang"
113+
skip-build-compiler-rt "" "set to skip building Compiler-RT"
113114
skip-build-swift "" "set to skip building Swift"
114115
skip-build-linux "" "set to skip building Swift stdlibs for Linux"
115116
skip-build-freebsd "" "set to skip building Swift stdlibs for FreeBSD"
@@ -624,8 +625,8 @@ function set_build_options_for_host() {
624625
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="${cmake_osx_deployment_target}"
625626
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
626627
-DLLVM_ENABLE_LIBCXX:BOOL=TRUE
627-
-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_COMPILER_RT})"
628-
-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL="$(false_true ${SKIP_COMPILER_RT})"
628+
-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
629+
-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL="$(false_true ${SKIP_BUILD_COMPILER_RT})"
629630
-DCOMPILER_RT_ENABLE_IOS:BOOL=FALSE
630631
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
631632
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
@@ -855,12 +856,12 @@ fi
855856
# FIXME: We currently do not support building compiler-rt with the
856857
# Xcode generator.
857858
if [[ "${CMAKE_GENERATOR}" == "Xcode" ]]; then
858-
SKIP_COMPILER_RT=1
859+
SKIP_BUILD_COMPILER_RT=1
859860
fi
860861

861862
# FIXME: We currently do not support cross-compiling swift with compiler-rt.
862863
if [[ "${CROSS_COMPILE_HOSTS}" ]]; then
863-
SKIP_COMPILER_RT=1
864+
SKIP_BUILD_COMPILER_RT=1
864865
fi
865866

866867
# WORKSPACE, BUILD_DIR and INSTALLABLE_PACKAGE must be absolute paths

0 commit comments

Comments
 (0)