mirror of
https://codeberg.org/ziglang/zig.git
synced 2025-12-06 13:54:21 +00:00
Merge pull request #21736 from alexrp/qemu-9.1
ci: Update to QEMU 9.1.0 in x86_64-linux scripts
This commit is contained in:
commit
fffbb511db
4 changed files with 6 additions and 8 deletions
|
|
@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388"
|
||||||
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
||||||
ZIG="$PREFIX/bin/zig"
|
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.
|
# Make the `zig version` number consistent.
|
||||||
# This will affect the cmake command below.
|
# This will affect the cmake command below.
|
||||||
|
|
@ -54,10 +54,9 @@ stage3-debug/bin/zig build \
|
||||||
-Dtarget=arm-linux-musleabihf \
|
-Dtarget=arm-linux-musleabihf \
|
||||||
-Dno-lib
|
-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 \
|
stage3-debug/bin/zig build test docs \
|
||||||
--maxrss 24696061952 \
|
--maxrss 24696061952 \
|
||||||
-fwasmtime \
|
|
||||||
-Dstatic-llvm \
|
-Dstatic-llvm \
|
||||||
-Dtarget=native-native-musl \
|
-Dtarget=native-native-musl \
|
||||||
--search-prefix "$PREFIX" \
|
--search-prefix "$PREFIX" \
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388"
|
||||||
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
||||||
ZIG="$PREFIX/bin/zig"
|
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.
|
# Make the `zig version` number consistent.
|
||||||
# This will affect the cmake command below.
|
# This will affect the cmake command below.
|
||||||
|
|
@ -54,10 +54,9 @@ stage3-release/bin/zig build \
|
||||||
-Dtarget=arm-linux-musleabihf \
|
-Dtarget=arm-linux-musleabihf \
|
||||||
-Dno-lib
|
-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 \
|
stage3-release/bin/zig build test docs \
|
||||||
--maxrss 24696061952 \
|
--maxrss 24696061952 \
|
||||||
-fwasmtime \
|
|
||||||
-Dstatic-llvm \
|
-Dstatic-llvm \
|
||||||
-Dtarget=native-native-musl \
|
-Dtarget=native-native-musl \
|
||||||
--search-prefix "$PREFIX" \
|
--search-prefix "$PREFIX" \
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388"
|
||||||
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
||||||
ZIG="$PREFIX/bin/zig"
|
ZIG="$PREFIX/bin/zig"
|
||||||
|
|
||||||
export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-8.2.1/bin:$HOME/local/bin:$PATH"
|
export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.1.0/bin:$HOME/local/bin:$PATH"
|
||||||
|
|
||||||
# Make the `zig version` number consistent.
|
# Make the `zig version` number consistent.
|
||||||
# This will affect the cmake command below.
|
# This will affect the cmake command below.
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.14.0-dev.1622+2ac543388"
|
||||||
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
PREFIX="$HOME/deps/$CACHE_BASENAME"
|
||||||
ZIG="$PREFIX/bin/zig"
|
ZIG="$PREFIX/bin/zig"
|
||||||
|
|
||||||
export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-8.2.1/bin:$HOME/local/bin:$PATH"
|
export PATH="$HOME/deps/wasmtime-v10.0.2-$ARCH-linux:$HOME/deps/qemu-linux-x86_64-9.1.0/bin:$HOME/local/bin:$PATH"
|
||||||
|
|
||||||
# Make the `zig version` number consistent.
|
# Make the `zig version` number consistent.
|
||||||
# This will affect the cmake command below.
|
# This will affect the cmake command below.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue