1- From 173de308e35d9cb7dcd65b0726ccd86bc2e0eb9b Mon Sep 17 00:00:00 2001
1+ From 24bd384f841df8f357fe35c6cc890cd7b15a4114 Mon Sep 17 00:00:00 2001
22From: Yuta Saito <kateinoigakukun@gmail.com>
33Date: Thu, 19 Sep 2024 04:45:51 +0000
44Subject: [PATCH 2/2] [wasm] Configure LLVM for WebAssembly target
@@ -11,11 +11,11 @@ we fixed the stdlib build to use `WASI` as the system name properly in
1111the previous commit. This exposed the issue that the host LLVM build
1212directory is not suitable for configuring the stdlib build.
1313---
14- .../products/wasmstdlib.py | 58 +++++++++++++++++--
15- 1 file changed, 52 insertions(+), 6 deletions(-)
14+ .../products/wasmstdlib.py | 60 +++++++++++++++++--
15+ 1 file changed, 54 insertions(+), 6 deletions(-)
1616
1717diff --git a/utils/swift_build_support/swift_build_support/products/wasmstdlib.py b/utils/swift_build_support/swift_build_support/products/wasmstdlib.py
18- index d042fc38038..3c93a7a679f 100644
18+ index d042fc38038..70299e37885 100644
1919--- a/utils/swift_build_support/swift_build_support/products/wasmstdlib.py
2020+++ b/utils/swift_build_support/swift_build_support/products/wasmstdlib.py
2121@@ -17,6 +17,8 @@ from . import llvm
@@ -27,7 +27,7 @@ index d042fc38038..3c93a7a679f 100644
2727
2828
2929 class WasmStdlib(cmake_product.CMakeProduct):
30- @@ -39,13 +41,50 @@ class WasmStdlib(cmake_product.CMakeProduct):
30+ @@ -39,13 +41,52 @@ class WasmStdlib(cmake_product.CMakeProduct):
3131 return self.args.test_wasmstdlib
3232
3333 def build(self, host_target):
@@ -57,6 +57,8 @@ index d042fc38038..3c93a7a679f 100644
5757+ cmake_options.define('LLVM_COMPILER_CHECKED:BOOL', 'TRUE')
5858+ cmake_options.define('LLVM_ENABLE_ZLIB:BOOL', 'FALSE')
5959+ cmake_options.define('LLVM_ENABLE_LIBXML2:BOOL', 'FALSE')
60+ + cmake_options.define('LLVM_ENABLE_LIBEDIT:BOOL', 'FALSE')
61+ + cmake_options.define('LLVM_ENABLE_TERMINFO:BOOL', 'FALSE')
6062+
6163+ llvm_cmake = cmake.CMake(
6264+ self.args, self.toolchain, prefer_native_toolchain=True)
@@ -80,7 +82,7 @@ index d042fc38038..3c93a7a679f 100644
8082 self.cmake_options.define(
8183 'SWIFT_STDLIB_BUILD_TYPE:STRING', self._build_variant)
8284
83- @@ -71,9 +110 ,13 @@ class WasmStdlib(cmake_product.CMakeProduct):
85+ @@ -71,9 +112 ,13 @@ class WasmStdlib(cmake_product.CMakeProduct):
8486 self.cmake_options.define('SWIFT_WASI_SYSROOT_PATH:STRING',
8587 self._wasi_sysroot_path(target_triple))
8688
@@ -97,7 +99,7 @@ index d042fc38038..3c93a7a679f 100644
9799 self.cmake_options.define('LLVM_DIR:PATH', llvm_cmake_dir)
98100
99101 # Standalone stdlib configuration
100- @@ -90,6 +133 ,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
102+ @@ -90,6 +135 ,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
101103 self.cmake_options.define('SWIFT_BUILD_STATIC_STDLIB:BOOL', 'TRUE')
102104 self.cmake_options.define('SWIFT_BUILD_DYNAMIC_STDLIB:BOOL', 'FALSE')
103105 self.cmake_options.define('SWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL', 'TRUE')
@@ -107,7 +109,7 @@ index d042fc38038..3c93a7a679f 100644
107109 self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
108110 self.cmake_options.define('SWIFT_STDLIB_HAS_ASLR:BOOL', 'FALSE')
109111 self.cmake_options.define('SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
110- @@ -200,7 +246 ,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
112+ @@ -200,7 +248 ,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
111113
112114 class WasmThreadsStdlib(WasmStdlib):
113115 def build(self, host_target):
0 commit comments