[WASM] Cleanup build-presets.ini to ease development build

Author: kateinoigakukun

utils/webassembly/build-presets.ini

@@ -3,18 +3,22 @@
 #===----------------------------------------------------------------------===#
 
 [preset: webassembly]
-no-assertions
-release
 cmake-c-launcher=%(C_CXX_LAUNCHER)s
 cmake-cxx-launcher=%(C_CXX_LAUNCHER)s
 skip-build-benchmarks
 llvm-targets-to-build=X86;AArch64;WebAssembly
+swift-darwin-supported-archs=x86_64
+
+[preset: webassembly-install]
+
+release
+no-assertions
+install-swift
 install-destdir=%(INSTALL_DESTDIR)s
 swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;testsuite-tools;toolchain-tools;license;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers;clang-resource-dir-symlink
 llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;lld;llvm-ar;llvm-ranlib
-install-swift
 install-prefix=/%(TOOLCHAIN_NAME)s/usr
-swift-darwin-supported-archs=x86_64
+
 
 [preset: webassembly-host]
 
@@ -24,6 +28,11 @@ extra-cmake-options=
     -DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
     -DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
 
+[preset: webassembly-host-install]
+mixin-preset=
+    webassembly-host
+    webassembly-install
+
 llbuild
 swiftpm
 indexstore-db
@@ -37,9 +46,9 @@ install-swiftpm
 install-sourcekit-lsp
 install-libcxx
 
-[preset: webassembly-linux-host]
+[preset: webassembly-linux-host-install]
 
-mixin-preset=webassembly-host
+mixin-preset=webassembly-host-install
 
 libdispatch
 libicu
@@ -60,9 +69,6 @@ skip-test-xctest
 
 mixin-preset=webassembly
 wasm
-verbose
-# Install lld, compiler-rt and clang
-install-llvm
 build-stdlib-deployment-targets=wasi-wasm32
 build-swift-dynamic-sdk-overlay=false
 build-swift-dynamic-stdlib=false
@@ -71,6 +77,15 @@ build-swift-static-stdlib
 stdlib-deployment-targets=wasi-wasm32
 wasi-sdk=%(SOURCE_PATH)s/wasi-sdk
 
+
+[preset: webassembly-target-install]
+mixin-preset=
+    webassembly-target
+    webassembly-install
+# Install lld, compiler-rt and clang
+install-llvm
+
+
 [preset: webassembly-linux-target]
 
 mixin-preset=webassembly-target
@@ -106,4 +121,14 @@ extra-cmake-options=
     -DCMAKE_AR='%(LLVM_BIN_DIR)s/llvm-ar'
     -DCMAKE_RANLIB='%(LLVM_BIN_DIR)s/llvm-ranlib'
     -DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
-    -DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE
+    -DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE
+
+[preset: webassembly-linux-target-install]
+mixin-preset=
+    webassembly-target-install
+    webassembly-linux-target
+
+[preset: webassembly-macos-target-install]
+mixin-preset=
+    webassembly-target-install
+    webassembly-macos-target

utils/webassembly/build-toolchain.sh

@@ -9,8 +9,8 @@ WASI_SDK_PATH=$SOURCE_PATH/wasi-sdk
 case $(uname -s) in
   Darwin)
     OS_SUFFIX=osx
-    HOST_PRESET=webassembly-host
-    TARGET_PRESET=webassembly-macos-target
+    HOST_PRESET=webassembly-host-install
+    TARGET_PRESET=webassembly-macos-target-install
     HOST_SUFFIX=macosx-x86_64
   ;;
   Linux)
@@ -22,8 +22,8 @@ case $(uname -s) in
       echo "Unknown Ubuntu version"
       exit 1
     fi
-    HOST_PRESET=webassembly-linux-host
-    TARGET_PRESET=webassembly-linux-target
+    HOST_PRESET=webassembly-linux-host-install
+    TARGET_PRESET=webassembly-linux-target-install
     HOST_SUFFIX=linux-x86_64
   ;;
   *)