Only setup local toolchain if build-compiler is not 0

Author: marcprux

swift-ci/sdks/android/build-local

@@ -25,16 +25,18 @@ WORKDIR=$(realpath ${WORKDIR})
 HOST_OS=ubuntu$(lsb_release -sr)
 source ./scripts/toolchain-vars.sh
 
-SWIFT_ROOT=${WORKDIR}/host-toolchain
-HOST_TOOLCHAIN=$SWIFT_ROOT/$SWIFT_BASE/usr
-if [[ ! -d "$HOST_TOOLCHAIN" ]]; then
-    ./scripts/install-swift.sh ${HOST_TOOLCHAIN}
-fi
+if [[ "${BUILD_COMPILER}" != "0" ]]; then
+    SWIFT_ROOT=${WORKDIR}/host-toolchain
+    HOST_TOOLCHAIN=$SWIFT_ROOT/$SWIFT_BASE/usr
+    if [[ ! -d "$HOST_TOOLCHAIN" ]]; then
+        ./scripts/install-swift.sh ${HOST_TOOLCHAIN}
+    fi
 
-$HOST_TOOLCHAIN/bin/swift --version
+    $HOST_TOOLCHAIN/bin/swift --version
 
-# ensure the correct Swift is first in the PATH
-export PATH=$HOST_TOOLCHAIN/bin:$PATH
+    # ensure the correct Swift is first in the PATH
+    export PATH=$HOST_TOOLCHAIN/bin:$PATH
+fi
 
 export ANDROID_NDK_HOME=${WORKDIR}/ndk/${ANDROID_NDK_VERSION}
 

swift-ci/sdks/android/scripts/fetch-source.sh

@@ -89,6 +89,9 @@ fi
 if [[ -z "${BORINGSSL_VERSION}" ]]; then
     BORINGSSL_VERSION=fips-20220613
 fi
+if [[ -z "${YAMS_VERSION}" ]]; then
+    YAMS_VERSION=5.0.6
+fi
 if [[ -z "${SWIFT_ANDROID_PATCHES_VERSION}" ]]; then
     SWIFT_ANDROID_PATCHES_VERSION=main
 fi
@@ -158,10 +161,13 @@ fi
 popd >/dev/null
 groupend
 
-# Fetch yams (needed for Swift 6.1.1)
+# Fetch yams (needed for Swift 6.1.x)
 groupstart "Fetching yams"
 pushd swift-project >/dev/null
 [[ -d yams ]] || git clone ${github}jpsim/Yams.git yams
+pushd libxml2 >/dev/null 2>&1
+git checkout ${YAMS_VERSION}
+popd >/dev/null 2>&1
 popd >/dev/null
 groupend