@@ -78,7 +78,7 @@ build_host_toolchain() {
78
78
79
79
build_target_toolchain () {
80
80
81
- COMPILER_RT_BUILD_DIR=" $TARGET_BUILD_ROOT /compiler-rt-wasi-wasm32"
81
+ local COMPILER_RT_BUILD_DIR=" $TARGET_BUILD_ROOT /compiler-rt-wasi-wasm32"
82
82
cmake -B " $COMPILER_RT_BUILD_DIR " \
83
83
-D CMAKE_TOOLCHAIN_FILE=" $SOURCE_PATH /swift/utils/webassembly/compiler-rt-cache.cmake" \
84
84
-D CMAKE_BUILD_TYPE=Release \
@@ -95,18 +95,25 @@ build_target_toolchain() {
95
95
96
96
ninja install -C " $COMPILER_RT_BUILD_DIR "
97
97
98
- SWIFT_STDLIB_BUILD_DIR=" $TARGET_BUILD_ROOT /swift-stdlib-wasi-wasm32"
99
- cmake -B " $TARGET_BUILD_ROOT /swift-stdlib-wasi-wasm32" \
98
+ # Only configure LLVM to use CMake functionalities in LLVM
99
+ local LLVM_TARGET_BUILD_DIR=" $TARGET_BUILD_ROOT /llvm-wasi-wasm32"
100
+ cmake -B " $LLVM_TARGET_BUILD_DIR " \
101
+ -D CMAKE_BUILD_TYPE=Release \
102
+ -D LLVM_ENABLE_ZLIB=NO \
103
+ -D LLVM_ENABLE_LIBXML2=NO \
104
+ -G Ninja \
105
+ -S " $SOURCE_PATH /llvm-project/llvm"
106
+
107
+ local SWIFT_STDLIB_BUILD_DIR=" $TARGET_BUILD_ROOT /swift-stdlib-wasi-wasm32"
108
+ cmake -B " $SWIFT_STDLIB_BUILD_DIR " \
100
109
-C " $SOURCE_PATH /swift/cmake/caches/Runtime-WASI-wasm32.cmake" \
110
+ -D CMAKE_TOOLCHAIN_FILE=" $SOURCE_PATH /swift/utils/webassembly/toolchain-wasi.cmake" \
101
111
-D CMAKE_BUILD_TYPE=Release \
102
- -D CMAKE_C_COMPILER=" $HOST_BUILD_DIR /llvm-$HOST_SUFFIX /bin/clang" \
103
- -D CMAKE_CXX_COMPILER=" $HOST_BUILD_DIR /llvm-$HOST_SUFFIX /bin/clang++" \
104
- -D CMAKE_RANLIB=" $HOST_BUILD_DIR /llvm-$HOST_SUFFIX /bin/llvm-ranlib" \
105
- -D CMAKE_AR=" $HOST_BUILD_DIR /llvm-$HOST_SUFFIX /bin/llvm-ar" \
106
112
-D CMAKE_C_COMPILER_LAUNCHER=" $( which sccache) " \
107
113
-D CMAKE_CXX_COMPILER_LAUNCHER=" $( which sccache) " \
108
114
-D CMAKE_INSTALL_PREFIX=" $DIST_TOOLCHAIN_SDK /usr" \
109
- -D LLVM_DIR=" $HOST_BUILD_DIR /llvm-$HOST_SUFFIX /lib/cmake/llvm/" \
115
+ -D LLVM_BIN=" $HOST_BUILD_DIR /llvm-$HOST_SUFFIX /bin" \
116
+ -D LLVM_DIR=" $LLVM_TARGET_BUILD_DIR /lib/cmake/llvm/" \
110
117
-D SWIFT_NATIVE_SWIFT_TOOLS_PATH=" $HOST_BUILD_DIR /swift-$HOST_SUFFIX /bin" \
111
118
-D SWIFT_WASI_SYSROOT_PATH=" $WASI_SYSROOT_PATH " \
112
119
-D SWIFT_WASI_wasm32_ICU_UC_INCLUDE=" $BUILD_SDK_PATH /icu/include" \
0 commit comments