commit f959326074ea6af9417a57d97a290d3fb559a2da Author: John McQuah <jmcquah@disroot.org> Date: Mon Jun 26 06:26:25 2023 -0400 wasi-compiler-rt: 15.0.7 -> 16.0.6 diff --git a/wasi-compiler-rt/.footprint b/wasi-compiler-rt/.footprint index 33e617d83..98e49434f 100644 --- a/wasi-compiler-rt/.footprint +++ b/wasi-compiler-rt/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/clang/ -drwxr-xr-x root/root usr/lib/clang/15.0.7/ -drwxr-xr-x root/root usr/lib/clang/15.0.7/lib/ -drwxr-xr-x root/root usr/lib/clang/15.0.7/lib/wasi/ --rw-r--r-- root/root usr/lib/clang/15.0.7/lib/wasi/libclang_rt.builtins-wasm32.a +drwxr-xr-x root/root usr/lib/clang/16/ +drwxr-xr-x root/root usr/lib/clang/16/lib/ +drwxr-xr-x root/root usr/lib/clang/16/lib/wasi/ +-rw-r--r-- root/root usr/lib/clang/16/lib/wasi/libclang_rt.builtins-wasm32.a diff --git a/wasi-compiler-rt/.signature b/wasi-compiler-rt/.signature index aadfc12e4..605e69b0b 100644 --- a/wasi-compiler-rt/.signature +++ b/wasi-compiler-rt/.signature @@ -1,9 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zaSNlKJjP2+L4vnfEwFm6b9YcVWM7QHQHva2R0Jqcv3h8fLyyikiMTlwBPGsExv12wpyi0BvzVe+TLZF2CvxgU= -SHA256 (Pkgfile) = 3bb76f1082ef2b3f7ae0cbce899e2a9047ddc5ef7a28d3b7010daae272343d89 -SHA256 (.footprint) = 3c285a883cfe8f946954e7ec4f30e1042630cf55769caf5edeb36e2cdfebd367 -SHA256 (compiler-rt-15.0.7.src.tar.xz) = 353832c66cce60931ea0413b3c071faad59eefa70d02c97daa8978b15e4b25b7 -SHA256 (llvm-15.0.7.src.tar.xz) = 4ad8b2cc8003c86d0078d15d987d84e3a739f24aae9033865c027abae93ee7a4 -SHA256 (cmake-15.0.7.src.tar.xz) = 8986f29b634fdaa9862eedda78513969fe9788301c9f2d938f4c10a3e7a3e7ea +RWSagIOpLGJF3zUnP+yeKlNSe9q9C8HLem4uYy/LXQxlqmsB63MV2qU70T/A0p+Qw59qpEfXYM7cw+RPPpHqPqfT6y6D/lbGYA0= +SHA256 (Pkgfile) = 4ae452f2377dfe0c39efc09444223ad6e4c9473ea996af86ca74fb088960aad1 +SHA256 (.footprint) = b04b6aaa855d88e034478d7aed48ddc83b788c5e37dce85483285d832c24f666 +SHA256 (compiler-rt-16.0.6.src.tar.xz) = 7911a2a9cca10393a17f637c01a6f5555b0a38f64ff47dc9168413a4190bc2db +SHA256 (llvm-16.0.6.src.tar.xz) = e91db44d1b3bb1c33fcea9a7d1f2423b883eaa9163d3d56ca2aa6d2f0711bc29 +SHA256 (cmake-16.0.6.src.tar.xz) = 39d342a4161095d2f28fb1253e4585978ac50521117da666e2b1f6f28b62f514 SHA256 (WASI.cmake) = e9e87d4781d6a999ee73a1e2c19754de01415124d0cd9746898f5ee7726dc1e1 -SHA256 (wasi-toolchain.cmake) = 52957ee81622bc22adcf0968cbb124a0595fa38e70549a355d42c6e487818edd +SHA256 (wasi-toolchain.cmake) = 55dd4d9daed4e369cf0a5863c658cd15bc1a04b380e55521b3f8d206220c6545 diff --git a/wasi-compiler-rt/Pkgfile b/wasi-compiler-rt/Pkgfile index ff1940dec..5f1fd2016 100644 --- a/wasi-compiler-rt/Pkgfile +++ b/wasi-compiler-rt/Pkgfile @@ -4,7 +4,7 @@ # Depends on: wasi-libc name=wasi-compiler-rt -version=15.0.7 +version=16.0.6 release=1 source=(https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/comp... https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/llvm... @@ -18,8 +18,8 @@ build() { install -D WASI.cmake cmake/Platform/WASI.cmake cmake -S compiler-rt-$version.src/lib/builtins -B build -G Ninja \ - -D CMAKE_INSTALL_PREFIX="/usr/lib/clang/$version" \ - -D COMPILER_RT_INSTALL_PATH="/usr/lib/clang/$version" \ + -D CMAKE_INSTALL_PREFIX="/usr/lib/clang/${version%%.*}" \ + -D COMPILER_RT_INSTALL_PATH="/usr/lib/clang/${version%%.*}" \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_C_FLAGS_RELEASE='-O3 -DNDEBUG -fno-exceptions --sysroot=/usr/share/wasi-sysroot' \ -D CMAKE_MODULE_PATH="$SRC/cmake" \ @@ -34,5 +34,5 @@ build() { cmake --build build DESTDIR=$PKG cmake --install build - /usr/bin/llvm-strip --strip-debug $PKG/usr/lib/clang/$version/lib/wasi/libclang_rt.builtins-wasm32.a + /usr/bin/llvm-strip --strip-debug $PKG/usr/lib/clang/${version%%.*}/lib/wasi/libclang_rt.builtins-wasm32.a } diff --git a/wasi-compiler-rt/wasi-toolchain.cmake b/wasi-compiler-rt/wasi-toolchain.cmake index 0920f7608..da5bdc872 100644 --- a/wasi-compiler-rt/wasi-toolchain.cmake +++ b/wasi-compiler-rt/wasi-toolchain.cmake @@ -16,10 +16,12 @@ 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)