Skip to content

Commit f9b79e4

Browse files
committed
Merge pull request swiftlang#1851 from vedantk/xcode-rt
Skip compiler-rt in Xcode-driven builds
2 parents 92d520c + 708c640 commit f9b79e4

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

utils/build-script-impl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ function set_deployment_target_based_options() {
490490
-DCMAKE_OSX_SYSROOT:PATH="$(xcrun --sdk ${xcrun_sdk_name} --show-sdk-path)"
491491
-DLLVM_HOST_TRIPLE:STRING="${llvm_host_triple}"
492492
-DLLVM_ENABLE_LIBCXX:BOOL=TRUE
493-
-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${#CROSS_COMPILE_TOOLS_DEPLOYMENT_TARGETS[@]})"
493+
-DLLVM_TOOL_COMPILER_RT_BUILD:BOOL="$(false_true ${SKIP_COMPILER_RT})"
494494
-DCOMPILER_RT_ENABLE_IOS:BOOL="$(false_true ${SKIP_IOS})"
495495
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
496496
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
@@ -738,6 +738,11 @@ if [[ "${SKIP_BUILD_WATCHOS_SIMULATOR}" ]] ; then
738738
SKIP_TEST_WATCHOS_SIMULATOR=1
739739
fi
740740

741+
# FIXME: We currently do not support cross-compiling swift with compiler-rt.
742+
if [[ "${CROSS_COMPILE_TOOLS_DEPLOYMENT_TARGETS}" ]]; then
743+
SKIP_COMPILER_RT=1
744+
fi
745+
741746
# WORKSPACE, BUILD_DIR and INSTALLABLE_PACKAGE must be absolute paths
742747
case "${WORKSPACE}" in
743748
/*) ;;
@@ -1231,6 +1236,10 @@ case "${CMAKE_GENERATOR}" in
12311236
"${COMMON_CMAKE_OPTIONS[@]}"
12321237
-DCMAKE_CONFIGURATION_TYPES="Debug;Release;MinSizeRel;RelWithDebInfo"
12331238
)
1239+
1240+
# FIXME: We currently do not support building compiler-rt with the
1241+
# Xcode generator.
1242+
SKIP_COMPILER_RT=1
12341243
;;
12351244
esac
12361245

0 commit comments

Comments
 (0)