From 0a8a3326aaed780880f6901e7ed9d28a48388eaf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:25:57 +0000 Subject: [PATCH 1/2] Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2024-08-29-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 c216adaa..f6b16a49 100644 --- a/schemes/main/manifest.json +++ b/schemes/main/manifest.json @@ -1,5 +1,5 @@ { - "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-08-28-a", + "base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-08-29-a", "build-compiler": false, "icu4c": [ "https://github.com/swiftwasm/icu4c-wasi/releases/download/0.10.0/icu4c-wasm32-unknown-wasi.tar.xz", From 2a49365f46354040313eda63a376a27441d5d7a8 Mon Sep 17 00:00:00 2001 From: Yuta Saito Date: Fri, 30 Aug 2024 12:49:28 +0000 Subject: [PATCH 2/2] Remove upstreamed patch --- ...t-for-WebAssembly-target-architectur.patch | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 schemes/main/swift-collections/0001-CMake-Add-support-for-WebAssembly-target-architectur.patch diff --git a/schemes/main/swift-collections/0001-CMake-Add-support-for-WebAssembly-target-architectur.patch b/schemes/main/swift-collections/0001-CMake-Add-support-for-WebAssembly-target-architectur.patch deleted file mode 100644 index 13434d01..00000000 --- a/schemes/main/swift-collections/0001-CMake-Add-support-for-WebAssembly-target-architectur.patch +++ /dev/null @@ -1,29 +0,0 @@ -From effb33569a926c12dc8e7bae979ac2075c219189 Mon Sep 17 00:00:00 2001 -From: Yuta Saito -Date: Fri, 26 Jul 2024 03:59:24 +0000 -Subject: [PATCH] [CMake] Add support for WebAssembly target architectures - -To repair the swift-corelibs-foundation build on WebAssembly, we need to -add support for Wasm targets to swift-collections' CMake build system. ---- - cmake/modules/SwiftSupport.cmake | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cmake/modules/SwiftSupport.cmake b/cmake/modules/SwiftSupport.cmake -index 0ce99fb8..21b9d693 100644 ---- a/cmake/modules/SwiftSupport.cmake -+++ b/cmake/modules/SwiftSupport.cmake -@@ -45,6 +45,10 @@ function(get_swift_host_arch result_var_name) - set("${result_var_name}" "i686" PARENT_SCOPE) - elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686") - set("${result_var_name}" "i686" PARENT_SCOPE) -+ elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "wasm32") -+ set("${result_var_name}" "wasm32" PARENT_SCOPE) -+ elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "wasm64") -+ set("${result_var_name}" "wasm64" PARENT_SCOPE) - else() - message(FATAL_ERROR "Unrecognized architecture on host system: ${CMAKE_SYSTEM_PROCESSOR}") - endif() --- -2.43.2 -