From 936b44e50adab86790d9882a14c5d52cdbd42b80 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 22 Nov 2022 01:20:22 -0800 Subject: [PATCH] CI: fix wrong directory paths --- ci/linux/build-x86_64-debug.sh | 7 ++++--- ci/linux/build-x86_64-release.sh | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/linux/build-x86_64-debug.sh b/ci/linux/build-x86_64-debug.sh index 2b11829f94ff5a717021830504e4383f5b3d2362..d62f0c41947e27a4459469029bd92537f0acb0f4 100755 --- a/ci/linux/build-x86_64-debug.sh +++ b/ci/linux/build-x86_64-debug.sh @@ -30,6 +30,7 @@ cd "$ZIGDIR" echo "building stage3-debug with zig version $($OLD_ZIG version)" "$OLD_ZIG" build \ + --prefix stage3 --search-prefix "$DEPS_LOCAL" \ --zig-lib-dir lib \ -Denable-stage1 \ @@ -39,14 +40,14 @@ echo "building stage3-debug with zig version $($OLD_ZIG version)" -Dtarget="$TARGET" echo "Looking for non-conforming code formatting..." -zig-out/bin/zig fmt --check . \ +stage3/bin/zig fmt --check . \ --exclude test/cases/ \ --exclude build # simultaneously test building self-hosted without LLVM and with 32-bit arm -zig-out/bin/zig build -Dtarget=arm-linux-musleabihf +stage3/bin/zig build -Dtarget=arm-linux-musleabihf -zig-out/bin/zig build test docs \ +stage3/bin/zig build test docs \ -fqemu \ -fwasmtime \ -Dstatic-llvm \ diff --git a/ci/linux/build-x86_64-release.sh b/ci/linux/build-x86_64-release.sh index 15571fb332008ef0cb3dd059e7f6f0512b190e27..f4c6d3c8922b7b3d25d98c78b7767bba1ccf251c 100755 --- a/ci/linux/build-x86_64-release.sh +++ b/ci/linux/build-x86_64-release.sh @@ -60,7 +60,6 @@ make -j2 install "stage3/bin/zig" build \ --prefix stage4 \ - -Dconfig_h="build/config.h" \ -Denable-llvm \ -Denable-stage1 \ -Dno-lib \ -- 2.54.0