From 8db7d68cd01d0f3e15690d670acc20138c399391 Mon Sep 17 00:00:00 2001 From: Naomi Kirby Date: Thu, 14 Nov 2024 18:20:32 -0800 Subject: [PATCH] Fix iOS build failures on Taskcluster (#10043) * Try unsetting SDKROOT before building * Tidy up some debug crufyiness --- taskcluster/scripts/build/ios_build_debug.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/taskcluster/scripts/build/ios_build_debug.sh b/taskcluster/scripts/build/ios_build_debug.sh index 5f8fc1db1..2878258e8 100755 --- a/taskcluster/scripts/build/ios_build_debug.sh +++ b/taskcluster/scripts/build/ios_build_debug.sh @@ -25,7 +25,6 @@ export LC_ALL=en_US.utf-8 export LANG=en_US.utf-8 export PYTHONIOENCODING="UTF-8" - print Y "Installing conda" # We need to call bash with a login shell, so that conda is intitialized source $TASK_WORKDIR/fetches/bin/activate @@ -45,11 +44,11 @@ if [ -d ${TASK_HOME}/build ]; then fi mkdir ${TASK_HOME}/build -env -whereis qt-cmake -cat $TASK_WORKDIR/fetches/bin/qt-cmake +# Clear the SDKROOT and rely on CMake to figure it out. Otherwise, if this +# is set to the host SDK it will break the iOS toolchain detection. +unset SDKROOT -qt-cmake -S . -B ${TASK_HOME}/build \ +$TASK_WORKDIR/fetches/bin/qt-cmake -S . -B ${TASK_HOME}/build \ -DCMAKE_OSX_ARCHITECTURES="arm64" \ -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="" \ -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED="NO" \