From b113415871bf097e538a454a3307eebb7c5c8070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 17 Oct 2024 23:17:19 +0200 Subject: [PATCH] ci: Remove -fwasmtime from aarch64-linux scripts. This is covered by the x86_64-linux scripts. Also remove the TODO comments related to -fqemu for the same reason. --- ci/aarch64-linux-debug.sh | 5 ++--- ci/aarch64-linux-release.sh | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/aarch64-linux-debug.sh b/ci/aarch64-linux-debug.sh index f1ffebcc63..47f75c4624 100644 --- a/ci/aarch64-linux-debug.sh +++ b/ci/aarch64-linux-debug.sh @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/local/bin:$PATH" +export PATH="$HOME/local/bin:$PATH" # Make the `zig version` number consistent. # This will affect the cmake command below. @@ -54,10 +54,9 @@ stage3-debug/bin/zig build \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -# TODO: add -fqemu back to this line +# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. stage3-debug/bin/zig build test docs \ --maxrss 24696061952 \ - -fwasmtime \ -Dstatic-llvm \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \ diff --git a/ci/aarch64-linux-release.sh b/ci/aarch64-linux-release.sh index 7ae5a3ceb4..a41255b454 100644 --- a/ci/aarch64-linux-release.sh +++ b/ci/aarch64-linux-release.sh @@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388" PREFIX="$HOME/deps/$CACHE_BASENAME" ZIG="$PREFIX/bin/zig" -export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/local/bin:$PATH" +export PATH="$HOME/local/bin:$PATH" # Make the `zig version` number consistent. # This will affect the cmake command below. @@ -54,10 +54,9 @@ stage3-release/bin/zig build \ -Dtarget=arm-linux-musleabihf \ -Dno-lib -# TODO: add -fqemu back to this line +# No -fqemu and -fwasmtime here as they're covered by the x86_64-linux scripts. stage3-release/bin/zig build test docs \ --maxrss 24696061952 \ - -fwasmtime \ -Dstatic-llvm \ -Dtarget=native-native-musl \ --search-prefix "$PREFIX" \