Skip to content

Commit e43d990

Browse files
Merge pull request #412 from swiftwasm/update-base-tag/main-swift-DEVELOPMENT-SNAPSHOT-2024-08-20-a
Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2024-08-20-a
2 parents 539bf36 + d4727a1 commit e43d990

File tree

3 files changed

+13
-36
lines changed

3 files changed

+13
-36
lines changed

schemes/main/build/build-foundation.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ BUILD_SDK_PATH="$SOURCE_PATH/build-sdk"
1313
LIBXML2_PATH="$BUILD_SDK_PATH/libxml2-$TRIPLE"
1414

1515
FOUNDATION_BUILD="$SOURCE_PATH/build/WebAssembly/foundation-$TRIPLE"
16+
FOUNDATION_MACROS_BUILD="$SOURCE_PATH/build/WebAssembly/foundation-macros-$TRIPLE"
1617

1718
swift_extra_flags=""
1819
c_extra_flags=""
@@ -21,6 +22,16 @@ if [[ "$TRIPLE" == "wasm32-unknown-wasip1-threads" ]]; then
2122
c_extra_flags="-mthread-model posix -pthread -ftls-model=local-exec"
2223
fi
2324

25+
cmake -G Ninja \
26+
-D CMAKE_C_COMPILER="$CLANG_BIN_DIR/clang" \
27+
-D CMAKE_CXX_COMPILER="$CLANG_BIN_DIR/clang++" \
28+
-D CMAKE_Swift_COMPILER="$SWIFT_BIN_DIR/swiftc" \
29+
-D BUILD_SHARED_LIBS=ON \
30+
-B "$FOUNDATION_MACROS_BUILD" \
31+
"${SOURCE_PATH}/swift-foundation/Sources/FoundationMacros"
32+
33+
cmake --build "$FOUNDATION_MACROS_BUILD"
34+
2435
cmake -G Ninja \
2536
-D CMAKE_BUILD_TYPE="Release" \
2637
-D CMAKE_SYSROOT="$WASI_SYSROOT_PATH" \
@@ -47,6 +58,7 @@ cmake -G Ninja \
4758
-D _SwiftCollections_SourceDIR="$SOURCE_PATH/swift-collections" \
4859
-D _SwiftFoundation_SourceDIR="$SOURCE_PATH/swift-foundation" \
4960
-D _SwiftFoundationICU_SourceDIR="$SOURCE_PATH/swift-foundation-icu" \
61+
-D SwiftFoundation_MACRO="$FOUNDATION_MACROS_BUILD/lib" \
5062
-B "$FOUNDATION_BUILD" \
5163
"${SOURCE_PATH}/swift-corelibs-foundation"
5264

schemes/main/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-08-19-a",
2+
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-08-20-a",
33
"build-compiler": false,
44
"icu4c": [
55
"https://github.com/swiftwasm/icu4c-wasi/releases/download/0.10.0/icu4c-wasm32-unknown-wasi.tar.xz",

schemes/main/swift-foundation/0001-Remove-the-include-setjmp.h-from-_CStdlib.h.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)