[Git][archlinux/packaging/packages/wasi-compiler-rt][main] Copy current toolchain file from wasi-sdk

[Jan Alexander Steffens (heftig) (@heftig)]

Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / wasi-compiler-rt


Commits:
53c9c310 by Jan Alexander Steffens (heftig) at 2025-01-10T03:03:10+01:00
Copy current toolchain file from wasi-sdk

Doesn't change the build output.

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- wasi-toolchain.cmake → wasi-sdk.cmake


Changes:

=====================================
.SRCINFO
=====================================
@@ -17,7 +17,7 @@ pkgbase = wasi-compiler-rt
        source = 
https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.6/cmake-19.1.6.src.tar.xz
        source = 
https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.6/cmake-19.1.6.src.tar.xz.sig
        source = WASI.cmake
-       source = wasi-toolchain.cmake
+       source = wasi-sdk.cmake
        validpgpkeys = 474E22316ABF4785A88C6E8EA2C794A986419D8A
        validpgpkeys = D574BD5D1D0E98895E3BF90044F2485E45D59042
        b2sums = 
014ab9c03650f4040050fc600167945003a0a73ae2a22c19fd9504aab00ee57df10eeb2b90514c14e294c0b5d43ce0b4b6d0c361cbfefcd6fb6adb67372cb953
@@ -25,6 +25,6 @@ pkgbase = wasi-compiler-rt
        b2sums = 
a1bc5fbf724a21d6eebfac4ed26544ef50069aa8e55398f66af9c9636799c790de7f069b4604f123cb20abda8fac3742844f9f3d966408e1dacdebf1a6cf5635
        b2sums = SKIP
        b2sums = 
c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4
-       b2sums = 
74c63bb838bc2e6d7980370fb3d47f8fd2f1dd8b6dc82302c7cc0b80e0fb1e8e21c1c62d6de0b78e478fc22611a5867e52b1ef7a566796fe831fffd98b17c940
+       b2sums = 
9f20eaa64069d20510a5ba6acdedfa4bbf723e1da13792bbbdfc57cc20d232962f5603a56c9723879624ab65e18f3770fda509dc76e3f099c3744acbfeabafc2
 
 pkgname = wasi-compiler-rt


=====================================
PKGBUILD
=====================================
@@ -12,13 +12,13 @@ makedepends=('cmake' 'ninja' 'llvm' 'clang' 'lld')
 
source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/compiler-rt-${pkgver}.src.tar.xz{,.sig}
         
https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/cmake-$pkgver.src.tar.xz{,.sig}
         WASI.cmake
-        wasi-toolchain.cmake)
+        wasi-sdk.cmake)
 
b2sums=('014ab9c03650f4040050fc600167945003a0a73ae2a22c19fd9504aab00ee57df10eeb2b90514c14e294c0b5d43ce0b4b6d0c361cbfefcd6fb6adb67372cb953'
         'SKIP'
         
'a1bc5fbf724a21d6eebfac4ed26544ef50069aa8e55398f66af9c9636799c790de7f069b4604f123cb20abda8fac3742844f9f3d966408e1dacdebf1a6cf5635'
         'SKIP'
         
'c829d807c257921fddb8c4d3752ad2291a2beb116d414dd31e34b7f6b01599d8c4807db87ef9930456ed8c9f30e8648e77028fa0b903c3a5ea840514f6022cf4'
-        
'74c63bb838bc2e6d7980370fb3d47f8fd2f1dd8b6dc82302c7cc0b80e0fb1e8e21c1c62d6de0b78e478fc22611a5867e52b1ef7a566796fe831fffd98b17c940')
+        
'9f20eaa64069d20510a5ba6acdedfa4bbf723e1da13792bbbdfc57cc20d232962f5603a56c9723879624ab65e18f3770fda509dc76e3f099c3744acbfeabafc2')
 options=('staticlibs')
 validpgpkeys=(
   '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard 
<tstel...@redhat.com>
@@ -42,7 +42,7 @@ build() {
     -DCMAKE_C_COMPILER_WORKS=ON \
     -DCMAKE_CXX_COMPILER_WORKS=ON \
     -DCMAKE_MODULE_PATH="${srcdir}"/make \
-    -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-toolchain.cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${srcdir}"/wasi-sdk.cmake \
     -DCOMPILER_RT_BAREMETAL_BUILD=On \
     -DCOMPILER_RT_INCLUDE_TESTS=OFF \
     -DCOMPILER_RT_HAS_FPIC_FLAG=OFF \


=====================================
wasi-toolchain.cmake → wasi-sdk.cmake
=====================================
@@ -1,7 +1,8 @@
 # Cmake toolchain description file for the Makefile
 
-# This is arbitrary, AFAIK, for now.
-cmake_minimum_required(VERSION 3.4.0)
+# Until Platform/WASI.cmake is upstream we need to inject the path to it
+# into CMAKE_MODULE_PATH.
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
 set(CMAKE_SYSTEM_NAME WASI)
 set(CMAKE_SYSTEM_VERSION 1)
@@ -9,17 +10,24 @@ set(CMAKE_SYSTEM_PROCESSOR wasm32)
 set(triple wasm32-wasi)
 
 if(WIN32)
-  set(WASI_HOST_EXE_SUFFIX ".exe")
+       set(WASI_HOST_EXE_SUFFIX ".exe")
 else()
-  set(WASI_HOST_EXE_SUFFIX "")
+       set(WASI_HOST_EXE_SUFFIX "")
+endif()
+
+# When building from source, WASI_SDK_PREFIX represents the generated directory
+if(NOT WASI_SDK_PREFIX)
+    set(WASI_SDK_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../)
 endif()
 
 set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
 set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
+set(CMAKE_ASM_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
 set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
 set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
 set(CMAKE_C_COMPILER_TARGET ${triple})
 set(CMAKE_CXX_COMPILER_TARGET ${triple})
+set(CMAKE_ASM_COMPILER_TARGET ${triple})
 
 # Don't look in the sysroot for executables to run during the build
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/wasi-compiler-rt/-/commit/53c9c310ac791aab2f3b7466427ac47bdb1149f6

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/wasi-compiler-rt/-/commit/53c9c310ac791aab2f3b7466427ac47bdb1149f6
You're receiving this email because of your account on gitlab.archlinux.org.