From d2e5c3dce469c8776e45c97e6467e2f7a0042749 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Mon, 11 Aug 2025 01:53:58 +0530 Subject: [PATCH] [build] Change Foundation macro checks because of #83422 I missed that `build-script` passes back `false` instead, so use the `true_false` function for broader checking. --- utils/build-script-impl | 4 ++-- validation-test/BuildSystem/android_cross_compile.test | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/build-script-impl b/utils/build-script-impl index 05e4f668e0093..737b52fe60be8 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -2336,7 +2336,7 @@ for host in "${ALL_HOSTS[@]}"; do continue fi - if [[ "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}" == "0" ]]; then + if [[ "$(true_false ${CROSS_COMPILE_BUILD_SWIFT_TOOLS})" == "FALSE" ]]; then echo "Skipping building Foundation Macros for ${host}, because the host tools are not being built" continue fi @@ -2925,7 +2925,7 @@ for host in "${ALL_HOSTS[@]}"; do continue fi - if [[ "${CROSS_COMPILE_BUILD_SWIFT_TOOLS}" == "0" && "${product}" == "foundation_macros" ]]; then + if [[ "$(true_false ${CROSS_COMPILE_BUILD_SWIFT_TOOLS})" == "FALSE" && "${product}" == "foundation_macros" ]]; then echo "Skipping installing Foundation Macros for ${host}, because the host tools are not being built" continue fi diff --git a/validation-test/BuildSystem/android_cross_compile.test b/validation-test/BuildSystem/android_cross_compile.test index a371bcc47722b..02c71aa308ce1 100644 --- a/validation-test/BuildSystem/android_cross_compile.test +++ b/validation-test/BuildSystem/android_cross_compile.test @@ -1,12 +1,14 @@ # REQUIRES: standalone_build # RUN: %empty-directory(%t) -# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --cmake %cmake --swift-testing --swift-testing-macros --install-swift-testing-macros --install-llvm --cross-compile-hosts=android-aarch64 --cross-compile-build-swift-tools=False --android --android-ndk %t/ndk/ --android-arch aarch64 2>&1 | %FileCheck %s +# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --cmake %cmake --foundation --swift-testing --swift-testing-macros --install-foundation --install-swift-testing-macros --install-llvm --cross-compile-hosts=android-aarch64 --cross-compile-build-swift-tools=False --android --android-ndk %t/ndk/ --android-arch aarch64 2>&1 | %FileCheck %s # CHECK: pushd {{.*}}/llvm-android-aarch64 # CHECK-NOT: cmake --build {{.*}}/llvm-android-aarch64 --config # CHECK-NOT: cmake --build {{.*}}/llvm-android-aarch64 {{.*}} install-llvm # CHECK: cmake {{.*}}-DSWIFT_INCLUDE_TOOLS:BOOL=FALSE{{.*}}/swift +# CHECK: Skipping building Foundation Macros for android-aarch64, because the host tools are not being built +# CHECK: Skipping installing Foundation Macros for android-aarch64, because the host tools are not being built # CHECK: Skipping building Testing Macros for android-aarch64, because the host tools are not being built # CHECK: Skipping installing Testing Macros for android-aarch64, because the host tools are not being built # CHECK: cmake {{.*}}-DCMAKE_TOOLCHAIN_FILE:PATH={{.*}}swifttesting-android-aarch64/BuildScriptToolchain.cmake