Avoid request Foundation/Dispatch/XCTest on macOS

Author: MaxDesiatov

utils/build-presets.ini

@@ -2451,18 +2451,23 @@ install-prefix=/%(TOOLCHAIN_NAME)s/usr
 [preset: webassembly-host]
 
 mixin-preset=webassembly
-xctest
 llbuild
 swiftpm
-install-foundation
-install-libdispatch
 install-swiftpm
-install-xctest
 extra-cmake-options=
     -DSWIFT_BUILD_SOURCEKIT=FALSE
     -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
     -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
 
+[preset: webassembly-linux-host]
+
+mixin-preset=webassembly-host
+libicu
+xctest
+install-foundation
+install-libdispatch
+install-xctest
+
 [preset: webassembly-target]
 
 mixin-preset=webassembly
@@ -2476,7 +2481,7 @@ build-swift-static-stdlib
 stdlib-deployment-targets=wasi-wasm32
 wasi-sdk=%(SOURCE_PATH)s/wasi-sdk
 
-[preset: webassembly-linux]
+[preset: webassembly-linux-target]
 
 mixin-preset=webassembly-target
 extra-cmake-options=
@@ -2491,7 +2496,7 @@ extra-cmake-options=
     -DCMAKE_AR="%(SOURCE_PATH)s/wasi-sdk/bin/llvm-ar"
     -DCMAKE_RANLIB="%(SOURCE_PATH)s/wasi-sdk/bin/llvm-ranlib"
 
-[preset: webassembly-macos]
+[preset: webassembly-macos-target]
 
 mixin-preset=webassembly-target
 extra-cmake-options=

utils/webassembly/build-toolchain.sh

@@ -9,11 +9,13 @@ WASI_SDK_PATH=$SOURCE_PATH/wasi-sdk
 case $(uname -s) in
   Darwin)
     OS_SUFFIX=osx
-    PRESET_NAME=webassembly-macos
+    HOST_PRESET=webassembly-host
+    TARGET_PRESET=webassembly-macos-target
   ;;
   Linux)
     OS_SUFFIX=linux
-    PRESET_NAME=webassembly-linux
+    HOST_PRESET=webassembly-linux-host
+    TARGET_PRESET=webassembly-linux-target
   ;;
   *)
     echo "Unrecognised platform $(uname -s)"
@@ -43,7 +45,7 @@ mkdir -p $HOST_TOOLCHAIN_SDK/usr/lib/clang/10.0.0
 
 # Build the host toolchain and SDK first.
 $SOURCE_PATH/swift/utils/build-script \
-  --preset=webassembly-host \
+  --preset=$HOST_PRESET \
   INSTALL_DESTDIR="$HOST_TOOLCHAIN_DESTDIR" \
   TOOLCHAIN_NAME="$TOOLCHAIN_NAME" \
   C_CXX_LAUNCHER="$(which sccache)"
@@ -55,7 +57,7 @@ rm -rf $SOURCE_PATH/build/Ninja-ReleaseAssert/swift-macosx-x86_64
 
 # build the cross-compilled toolchain
 $SOURCE_PATH/swift/utils/build-script \
-  --preset=$PRESET_NAME \
+  --preset=$TARGET_PRESET \
   INSTALL_DESTDIR="$SOURCE_PATH/install" \
   SOURCE_PATH="$SOURCE_PATH" \
   BUNDLE_IDENTIFIER="${BUNDLE_IDENTIFIER}" \