Skip to content

Commit 1aded39

Browse files
authored
[build-script] Disable building and installing the Foundation macros for standalone SDKs (swiftlang#78782)
Also, remove CMake flag for Android that is now directly set in that repo.
1 parent b97582b commit 1aded39

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

utils/build-script-impl

+10-5
Original file line numberDiff line numberDiff line change
@@ -2409,6 +2409,11 @@ for host in "${ALL_HOSTS[@]}"; do
24092409
continue
24102410
fi
24112411

2412+
if [[ "${BUILD_SWIFT_TOOLS}" == "0" ]]; then
2413+
echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built"
2414+
continue
2415+
fi
2416+
24122417
if [[ "${SKIP_CLEAN_FOUNDATION}" == "0" ]]
24132418
then
24142419
# The Swift project might have been changed, but CMake might
@@ -2558,11 +2563,6 @@ for host in "${ALL_HOSTS[@]}"; do
25582563
-DCMAKE_FIND_ROOT_PATH:PATH="${CROSS_COMPILE_DEPS_PATH}"
25592564
)
25602565
fi
2561-
if [[ "${host}" == "android-"* ]]; then
2562-
cmake_options+=(
2563-
-DCMAKE_HAVE_LIBC_PTHREAD=True
2564-
)
2565-
fi
25662566
;;
25672567
libdispatch|libdispatch_static)
25682568
LIBDISPATCH_BUILD_DIR=$(build_directory ${host} ${product})
@@ -3009,6 +3009,11 @@ for host in "${ALL_HOSTS[@]}"; do
30093009
continue
30103010
fi
30113011

3012+
if [[ "${BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then
3013+
echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built"
3014+
continue
3015+
fi
3016+
30123017
if [[ -z "${INSTALL_FOUNDATION}" ]] ; then
30133018
continue
30143019
fi

0 commit comments

Comments
 (0)