Skip to content

Commit 1a27ecc

Browse files
kateinoigakukunkateinoigakukun
committed
[WASM] Separate build-presets file
1 parent de19694 commit 1a27ecc

File tree

3 files changed

+111
-110
lines changed

3 files changed

+111
-110
lines changed

‎utils/build-presets.ini

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -2567,113 +2567,3 @@ no-assertions
25672567
mixin-preset=source_compat_suite_linux_base
25682568
debug
25692569
no-assertions
2570-
2571-
#===----------------------------------------------------------------------===#
2572-
# Preset for the WebAssembly toolchain and SDK
2573-
#===----------------------------------------------------------------------===#
2574-
2575-
[preset: webassembly]
2576-
no-assertions
2577-
release
2578-
cmake-c-launcher=%(C_CXX_LAUNCHER)s
2579-
cmake-cxx-launcher=%(C_CXX_LAUNCHER)s
2580-
skip-build-benchmarks
2581-
llvm-targets-to-build=X86;AArch64;WebAssembly
2582-
install-destdir=%(INSTALL_DESTDIR)s
2583-
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
2584-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;lld;llvm-ar;llvm-ranlib
2585-
install-swift
2586-
install-prefix=/%(TOOLCHAIN_NAME)s/usr
2587-
swift-darwin-supported-archs=x86_64
2588-
2589-
[preset: webassembly-host]
2590-
2591-
mixin-preset=webassembly
2592-
extra-cmake-options=
2593-
-DSWIFT_BUILD_SOURCEKIT=FALSE
2594-
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
2595-
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
2596-
2597-
llbuild
2598-
swiftpm
2599-
indexstore-db
2600-
sourcekit-lsp
2601-
libcxx
2602-
2603-
install-llvm
2604-
install-swift
2605-
install-llbuild
2606-
install-swiftpm
2607-
install-sourcekit-lsp
2608-
install-libcxx
2609-
2610-
[preset: webassembly-linux-host]
2611-
2612-
mixin-preset=webassembly-host
2613-
2614-
libdispatch
2615-
libicu
2616-
foundation
2617-
xctest
2618-
2619-
install-libicu
2620-
install-foundation
2621-
install-libdispatch
2622-
install-xctest
2623-
2624-
skip-test-libicu
2625-
skip-test-foundation
2626-
skip-test-libdispatch
2627-
skip-test-xctest
2628-
2629-
[preset: webassembly-target]
2630-
2631-
mixin-preset=webassembly
2632-
wasm
2633-
verbose
2634-
# Install lld, compiler-rt and clang
2635-
install-llvm
2636-
build-stdlib-deployment-targets=wasi-wasm32
2637-
build-swift-dynamic-sdk-overlay=false
2638-
build-swift-dynamic-stdlib=false
2639-
build-swift-static-sdk-overlay
2640-
build-swift-static-stdlib
2641-
stdlib-deployment-targets=wasi-wasm32
2642-
wasi-sdk=%(SOURCE_PATH)s/wasi-sdk
2643-
2644-
[preset: webassembly-linux-target]
2645-
2646-
mixin-preset=webassembly-target
2647-
extra-cmake-options=
2648-
-DWASI_ICU_URL:STRING="https://github.com/swiftwasm/icu4c-wasi/releases/download/0.5.0/icu4c-wasi.tar.xz"
2649-
-DWASI_ICU_MD5:STRING="25943864ebbfff15cf5aee8d9d5cc4d7"
2650-
-DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI
2651-
-DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32
2652-
-DSWIFT_SDKS='WASI;LINUX'
2653-
-DSWIFT_STDLIB_SINGLE_THREADED_RUNTIME=TRUE
2654-
-DSWIFT_BUILD_SOURCEKIT=FALSE
2655-
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
2656-
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
2657-
-DCMAKE_AR="%(TOOLS_BIN_DIR)s/llvm-ar"
2658-
-DCMAKE_RANLIB="%(TOOLS_BIN_DIR)s/llvm-ranlib"
2659-
-DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
2660-
-DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE
2661-
2662-
[preset: webassembly-macos-target]
2663-
2664-
mixin-preset=webassembly-target
2665-
extra-cmake-options=
2666-
-DWASI_ICU_URL:STRING="https://github.com/swiftwasm/icu4c-wasi/releases/download/0.5.0/icu4c-wasi.tar.xz"
2667-
-DWASI_ICU_MD5:STRING="25943864ebbfff15cf5aee8d9d5cc4d7"
2668-
-DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI
2669-
-DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32
2670-
-DSWIFT_SDKS='WASI'
2671-
-DSWIFT_STDLIB_SINGLE_THREADED_RUNTIME=TRUE
2672-
-DSWIFT_OSX_x86_64_ICU_STATICLIB=TRUE
2673-
-DSWIFT_BUILD_SOURCEKIT=FALSE
2674-
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
2675-
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
2676-
-DCMAKE_AR='%(TOOLS_BIN_DIR)s/llvm-ar'
2677-
-DCMAKE_RANLIB='%(TOOLS_BIN_DIR)s/llvm-ranlib'
2678-
-DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
2679-
-DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE

‎utils/webassembly/build-presets.ini

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
#===----------------------------------------------------------------------===#
2+
# Preset for the WebAssembly toolchain and SDK
3+
#===----------------------------------------------------------------------===#
4+
5+
[preset: webassembly]
6+
no-assertions
7+
release
8+
cmake-c-launcher=%(C_CXX_LAUNCHER)s
9+
cmake-cxx-launcher=%(C_CXX_LAUNCHER)s
10+
skip-build-benchmarks
11+
llvm-targets-to-build=X86;AArch64;WebAssembly
12+
install-destdir=%(INSTALL_DESTDIR)s
13+
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
14+
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-resource-headers;compiler-rt;clangd;dsymutil;lld;llvm-ar;llvm-ranlib
15+
install-swift
16+
install-prefix=/%(TOOLCHAIN_NAME)s/usr
17+
swift-darwin-supported-archs=x86_64
18+
19+
[preset: webassembly-host]
20+
21+
mixin-preset=webassembly
22+
extra-cmake-options=
23+
-DSWIFT_BUILD_SOURCEKIT=FALSE
24+
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
25+
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
26+
27+
llbuild
28+
swiftpm
29+
indexstore-db
30+
sourcekit-lsp
31+
libcxx
32+
33+
install-llvm
34+
install-swift
35+
install-llbuild
36+
install-swiftpm
37+
install-sourcekit-lsp
38+
install-libcxx
39+
40+
[preset: webassembly-linux-host]
41+
42+
mixin-preset=webassembly-host
43+
44+
libdispatch
45+
libicu
46+
foundation
47+
xctest
48+
49+
install-libicu
50+
install-foundation
51+
install-libdispatch
52+
install-xctest
53+
54+
skip-test-libicu
55+
skip-test-foundation
56+
skip-test-libdispatch
57+
skip-test-xctest
58+
59+
[preset: webassembly-target]
60+
61+
mixin-preset=webassembly
62+
wasm
63+
verbose
64+
# Install lld, compiler-rt and clang
65+
install-llvm
66+
build-stdlib-deployment-targets=wasi-wasm32
67+
build-swift-dynamic-sdk-overlay=false
68+
build-swift-dynamic-stdlib=false
69+
build-swift-static-sdk-overlay
70+
build-swift-static-stdlib
71+
stdlib-deployment-targets=wasi-wasm32
72+
wasi-sdk=%(SOURCE_PATH)s/wasi-sdk
73+
74+
[preset: webassembly-linux-target]
75+
76+
mixin-preset=webassembly-target
77+
extra-cmake-options=
78+
-DWASI_ICU_URL:STRING="https://github.com/swiftwasm/icu4c-wasi/releases/download/0.5.0/icu4c-wasi.tar.xz"
79+
-DWASI_ICU_MD5:STRING="25943864ebbfff15cf5aee8d9d5cc4d7"
80+
-DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI
81+
-DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32
82+
-DSWIFT_SDKS='WASI;LINUX'
83+
-DSWIFT_STDLIB_SINGLE_THREADED_RUNTIME=TRUE
84+
-DSWIFT_BUILD_SOURCEKIT=FALSE
85+
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
86+
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
87+
-DCMAKE_AR="%(TOOLS_BIN_DIR)s/llvm-ar"
88+
-DCMAKE_RANLIB="%(TOOLS_BIN_DIR)s/llvm-ranlib"
89+
-DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
90+
-DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE
91+
92+
[preset: webassembly-macos-target]
93+
94+
mixin-preset=webassembly-target
95+
extra-cmake-options=
96+
-DWASI_ICU_URL:STRING="https://github.com/swiftwasm/icu4c-wasi/releases/download/0.5.0/icu4c-wasi.tar.xz"
97+
-DWASI_ICU_MD5:STRING="25943864ebbfff15cf5aee8d9d5cc4d7"
98+
-DSWIFT_PRIMARY_VARIANT_SDK:STRING=WASI
99+
-DSWIFT_PRIMARY_VARIANT_ARCH:STRING=wasm32
100+
-DSWIFT_SDKS='WASI'
101+
-DSWIFT_STDLIB_SINGLE_THREADED_RUNTIME=TRUE
102+
-DSWIFT_OSX_x86_64_ICU_STATICLIB=TRUE
103+
-DSWIFT_BUILD_SOURCEKIT=FALSE
104+
-DSWIFT_ENABLE_SOURCEKIT_TESTS=FALSE
105+
-DSWIFT_BUILD_SYNTAXPARSERLIB=FALSE
106+
-DCMAKE_AR='%(TOOLS_BIN_DIR)s/llvm-ar'
107+
-DCMAKE_RANLIB='%(TOOLS_BIN_DIR)s/llvm-ranlib'
108+
-DCLANG_COMPILER_RT_CMAKE_ARGS='-DCMAKE_TOOLCHAIN_FILE=%(SOURCE_PATH)s/swift/utils/webassembly/compiler-rt-cache.cmake'
109+
-DSWIFTWASM_DISABLE_REFLECTION_TEST=TRUE

‎utils/webassembly/build-toolchain.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ build_host_toolchain() {
6565
# Build the host toolchain and SDK first.
6666
env SWIFT_BUILD_ROOT="$HOST_BUILD_ROOT" \
6767
"$SOURCE_PATH/swift/utils/build-script" \
68+
--preset-file="$UTILS_PATH/build-presets.ini" \
6869
--preset=$HOST_PRESET \
6970
--build-dir="$HOST_BUILD_DIR" \
7071
INSTALL_DESTDIR="$HOST_TOOLCHAIN_DESTDIR" \
@@ -84,6 +85,7 @@ build_target_toolchain() {
8485
# build the cross-compilled toolchain
8586
env SWIFT_BUILD_ROOT="$TARGET_BUILD_ROOT" \
8687
"$SOURCE_PATH/swift/utils/build-script" \
88+
--preset-file="$UTILS_PATH/build-presets.ini" \
8789
--preset=$TARGET_PRESET \
8890
--build-dir="$TARGET_BUILD_DIR" \
8991
INSTALL_DESTDIR="$TARGET_TOOLCHAIN_DESTDIR" \

0 commit comments

Comments
 (0)