From ec3eee46a70d88066503861756b2b9ca44c157aa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:30:34 +0000 Subject: [PATCH 1/2] Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2024-11-28-a --- schemes/main/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemes/main/manifest.json b/schemes/main/manifest.json index 70728a2f..4ac117f2 100644 --- a/schemes/main/manifest.json +++ b/schemes/main/manifest.json @@ -1,5 +1,5 @@ { - "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-11-20-a", + "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-11-28-a", "build-compiler": false, "icu4c": [], "libxml2": [ From c42d90ac19fd3824a4a2ea071f5ef462ee669a77 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 29 Nov 2024 12:54:38 +0000 Subject: [PATCH 2/2] Remove upstreamed patch --- ...asm-Enable-filesystem-APIs-in-libcxx.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 schemes/main/swift/0001-wasm-Enable-filesystem-APIs-in-libcxx.patch diff --git a/schemes/main/swift/0001-wasm-Enable-filesystem-APIs-in-libcxx.patch b/schemes/main/swift/0001-wasm-Enable-filesystem-APIs-in-libcxx.patch deleted file mode 100644 index e69b757b..00000000 --- a/schemes/main/swift/0001-wasm-Enable-filesystem-APIs-in-libcxx.patch +++ /dev/null @@ -1,31 +0,0 @@ -From afea9c53c26146eb7a11e49dd7acf1968bbc59a7 Mon Sep 17 00:00:00 2001 -From: Yuta Saito -Date: Wed, 20 Nov 2024 20:59:28 +0000 -Subject: [PATCH] wasm: Enable filesystem APIs in libcxx - -As of a recent fix included in LLVM 17[1] and wasi-libc fix[2], we can -enable `LIBCXX_ENABLE_FILESYSTEM` in libcxx build for WebAssembly/WASI. -This allows us to use ``, ``, etc in C++ code. - -[1]: https://github.com/llvm/llvm-project/commit/66a562d22e708ba40b8443b58e504ac3f983ba59 -[2]: https://github.com/WebAssembly/wasi-libc/pull/463 ---- - .../swift_build_support/products/wasisysroot.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/swift_build_support/swift_build_support/products/wasisysroot.py b/utils/swift_build_support/swift_build_support/products/wasisysroot.py -index 9f0c2a3a571..2f355760e2f 100644 ---- a/utils/swift_build_support/swift_build_support/products/wasisysroot.py -+++ b/utils/swift_build_support/swift_build_support/products/wasisysroot.py -@@ -203,7 +203,7 @@ class WasmLLVMRuntimeLibs(cmake_product.CMakeProduct): - self.cmake_options.define('LIBCXX_ENABLE_SHARED:BOOL', 'FALSE') - self.cmake_options.define('LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY:BOOL', 'FALSE') - self.cmake_options.define('LIBCXX_ENABLE_EXCEPTIONS:BOOL', 'FALSE') -- self.cmake_options.define('LIBCXX_ENABLE_FILESYSTEM:BOOL', 'FALSE') -+ self.cmake_options.define('LIBCXX_ENABLE_FILESYSTEM:BOOL', 'TRUE') - self.cmake_options.define('LIBCXX_CXX_ABI', 'libcxxabi') - self.cmake_options.define('LIBCXX_HAS_MUSL_LIBC:BOOL', 'TRUE') - --- -2.46.0 -