Skip to content

Commit d60e56c

Browse files
Apply CMake fix for swift-foundation-icu
1 parent 78237d4 commit d60e56c

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From a885d4bbc2ddb919311054153f6f0bd3bde8c6fb Mon Sep 17 00:00:00 2001
2+
From: Yuta Saito <[email protected]>
3+
Date: Fri, 20 Sep 2024 08:06:15 +0900
4+
Subject: [PATCH] CMake: Fix accidental variable expansion of `WASI` (#45)
5+
6+
---
7+
CMakeLists.txt | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/CMakeLists.txt b/CMakeLists.txt
11+
index 8f371b1..e16d54b 100644
12+
--- a/CMakeLists.txt
13+
+++ b/CMakeLists.txt
14+
@@ -57,7 +57,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
15+
$<$<COMPILE_LANGUAGE:C,CXX>:U_TIMEZONE=_timezone>
16+
$<$<COMPILE_LANGUAGE:C,CXX>:_CRT_SECURE_NO_DEPRECATE>
17+
$<$<COMPILE_LANGUAGE:C,CXX>:U_PLATFORM_USES_ONLY_WIN32_API>)
18+
-elseif(CMAKE_SYSTEM_NAME STREQUAL WASI)
19+
+elseif(CMAKE_SYSTEM_NAME STREQUAL "WASI")
20+
# WASI specific settings
21+
add_compile_definitions(
22+
$<$<COMPILE_LANGUAGE:C,CXX>:U_HAVE_TZSET=0>
23+
--
24+
2.46.0
25+

tools/git-swift-workspace

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def main():
2626
CheckoutCorelibsAction(options),
2727
ApplyPatchesAction(options, 'swift-corelibs-foundation'),
2828
ApplyPatchesAction(options, 'swift-foundation'),
29+
ApplyPatchesAction(options, 'swift-foundation-icu'),
2930
ApplyPatchesAction(options, 'swift-collections'),
3031
ApplyPatchesAction(options, 'swift-corelibs-xctest'),
3132
]

0 commit comments

Comments
 (0)