Skip to content

Commit 8a8c999

Browse files
Add CMAKE_Swift_COMPILER_WORKS
1 parent 599bacf commit 8a8c999

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8105c1de468d1962c7aacd0aaf31ec2dc90121c0 Mon Sep 17 00:00:00 2001
1+
From 173de308e35d9cb7dcd65b0726ccd86bc2e0eb9b 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 | 57 +++++++++++++++++--
15-
1 file changed, 51 insertions(+), 6 deletions(-)
14+
.../products/wasmstdlib.py | 58 +++++++++++++++++--
15+
1 file changed, 52 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..f87cd87d41c 100644
18+
index d042fc38038..3c93a7a679f 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
@@ -80,7 +80,7 @@ index d042fc38038..f87cd87d41c 100644
8080
self.cmake_options.define(
8181
'SWIFT_STDLIB_BUILD_TYPE:STRING', self._build_variant)
8282

83-
@@ -71,9 +110,12 @@ class WasmStdlib(cmake_product.CMakeProduct):
83+
@@ -71,9 +110,13 @@ class WasmStdlib(cmake_product.CMakeProduct):
8484
self.cmake_options.define('SWIFT_WASI_SYSROOT_PATH:STRING',
8585
self._wasi_sysroot_path(target_triple))
8686

@@ -91,12 +91,13 @@ index d042fc38038..f87cd87d41c 100644
9191
+ # so skip compiler health checks here.
9292
+ self.cmake_options.define('CMAKE_C_COMPILER_WORKS:BOOL', 'TRUE')
9393
+ self.cmake_options.define('CMAKE_CXX_COMPILER_WORKS:BOOL', 'TRUE')
94+
+ self.cmake_options.define('CMAKE_Swift_COMPILER_WORKS:BOOL', 'TRUE')
9495
+ self.cmake_options.define('LLVM_COMPILER_CHECKED:BOOL', 'TRUE')
9596
+
9697
self.cmake_options.define('LLVM_DIR:PATH', llvm_cmake_dir)
9798

9899
# Standalone stdlib configuration
99-
@@ -90,6 +132,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
100+
@@ -90,6 +133,9 @@ class WasmStdlib(cmake_product.CMakeProduct):
100101
self.cmake_options.define('SWIFT_BUILD_STATIC_STDLIB:BOOL', 'TRUE')
101102
self.cmake_options.define('SWIFT_BUILD_DYNAMIC_STDLIB:BOOL', 'FALSE')
102103
self.cmake_options.define('SWIFT_BUILD_STATIC_SDK_OVERLAY:BOOL', 'TRUE')
@@ -106,7 +107,7 @@ index d042fc38038..f87cd87d41c 100644
106107
self.cmake_options.define('SWIFT_STDLIB_TRACING:BOOL', 'FALSE')
107108
self.cmake_options.define('SWIFT_STDLIB_HAS_ASLR:BOOL', 'FALSE')
108109
self.cmake_options.define('SWIFT_STDLIB_CONCURRENCY_TRACING:BOOL', 'FALSE')
109-
@@ -200,7 +245,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
110+
@@ -200,7 +246,7 @@ class WasmStdlib(cmake_product.CMakeProduct):
110111

111112
class WasmThreadsStdlib(WasmStdlib):
112113
def build(self, host_target):

0 commit comments

Comments
 (0)