Skip to content

Commit 13a200a

Browse files
Skip llvm compiler checks
1 parent be42ace commit 13a200a

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

schemes/main/swift/0002-wasm-Configure-LLVM-for-WebAssembly-target-independe.patch

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 574c78452bf15a8c801c2c1e5c53d60192528a79 Mon Sep 17 00:00:00 2001
1+
From 8b7f1aaa735d1d0b994fc9ac9009f4bc9805a142 Mon Sep 17 00:00:00 2001
22
From: Yuta Saito <[email protected]>
33
Date: Thu, 19 Sep 2024 04:45:51 +0000
44
Subject: [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
1111
the previous commit. This exposed the issue that the host LLVM build
1212
directory is not suitable for configuring the stdlib build.
1313
---
14-
.../products/wasmstdlib.py | 53 ++++++++++++++++---
15-
1 file changed, 47 insertions(+), 6 deletions(-)
14+
.../products/wasmstdlib.py | 54 ++++++++++++++++---
15+
1 file changed, 48 insertions(+), 6 deletions(-)
1616

1717
diff --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..2e780a0453b 100644
18+
index d042fc38038..09d90be7fe9 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..2e780a0453b 100644
2727

2828

2929
class WasmStdlib(cmake_product.CMakeProduct):
30-
@@ -39,13 +41,52 @@ class WasmStdlib(cmake_product.CMakeProduct):
30+
@@ -39,13 +41,53 @@ class WasmStdlib(cmake_product.CMakeProduct):
3131
return self.args.test_wasmstdlib
3232

3333
def build(self, host_target):
@@ -57,6 +57,7 @@ index d042fc38038..2e780a0453b 100644
5757
+ # so skip compiler health checks here.
5858
+ cmake_options.define('CMAKE_C_COMPILER_WORKS:BOOL', 'TRUE')
5959
+ cmake_options.define('CMAKE_CXX_COMPILER_WORKS:BOOL', 'TRUE')
60+
+ cmake_options.define('LLVM_COMPILER_CHECKED:BOOL', 'TRUE')
6061
+ cmake_options.define('LLVM_ENABLE_ZLIB:BOOL', 'FALSE')
6162
+ cmake_options.define('LLVM_ENABLE_LIBXML2:BOOL', 'FALSE')
6263
+
@@ -82,7 +83,7 @@ index d042fc38038..2e780a0453b 100644
8283
self.cmake_options.define(
8384
'SWIFT_STDLIB_BUILD_TYPE:STRING', self._build_variant)
8485

85-
@@ -71,9 +112,6 @@ class WasmStdlib(cmake_product.CMakeProduct):
86+
@@ -71,9 +113,6 @@ class WasmStdlib(cmake_product.CMakeProduct):
8687
self.cmake_options.define('SWIFT_WASI_SYSROOT_PATH:STRING',
8788
self._wasi_sysroot_path(target_triple))
8889

@@ -92,7 +93,7 @@ index d042fc38038..2e780a0453b 100644
9293
self.cmake_options.define('LLVM_DIR:PATH', llvm_cmake_dir)
9394

9495
# Standalone stdlib configuration
95-
@@ -90,6 +128,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
96+
@@ -90,6 +129,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
9697
self.cmake_options.define('SWIFT_BUILD_STATIC_STDLIB:BOOL', 'TRUE')
9798
self.cmake_options.define('SWIFT_BUILD_DYNAMIC_STDLIB:BOOL', 'FALSE')
9899
self.cmake_options.define('SWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL', 'TRUE')
@@ -102,7 +103,7 @@ index d042fc38038..2e780a0453b 100644
102103
self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
103104
self.cmake_options.define('SWIFT_STDLIB_HAS_ASLR:BOOL', 'FALSE')
104105
self.cmake_options.define('SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
105-
@@ -200,7 +241,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
106+
@@ -200,7 +242,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
106107

107108
class WasmThreadsStdlib(WasmStdlib):
108109
def build(self, host_target):

0 commit comments

Comments
 (0)