authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-07 00:38:48-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-07 00:38:48-07:00
logee1b37040484637b2c8136adf8cc7da833beddfc
tree4e94755ac91b8f9fe1b0d3fa2b95dec039350382
parenta279cf81b2249ec7f5f7818fd0e3db3ce299853f

ci: don't use ninja on linux

I got this error when re-running the cmake line setting -DZIG_EXECUTABLE: ``` ninja: warning: multiple rules generate zig1.o. builds involving this target will not be correct; continuing anyway [-w dupbuild=warn] ``` But it works fine with make.

1 files changed, 5 insertions(+), 5 deletions(-)

ci/azure/linux_script+5-5
...@@ -4,7 +4,7 @@ set -x...@@ -4,7 +4,7 @@ set -x
4set -e4set -e
55
6sudo apt-get update -q6sudo apt-get update -q
7sudo apt-get install -y cmake s3cmd ninja-build tidy7sudo apt-get install -y cmake s3cmd tidy
88
9ZIGDIR="$(pwd)"9ZIGDIR="$(pwd)"
10ARCH="$(uname -m)"10ARCH="$(uname -m)"
...@@ -12,6 +12,7 @@ TARGET="$ARCH-linux-musl"...@@ -12,6 +12,7 @@ TARGET="$ARCH-linux-musl"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.859+f1ef0a80f"12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.859+f1ef0a80f"
13PREFIX="$HOME/$CACHE_BASENAME"13PREFIX="$HOME/$CACHE_BASENAME"
14MCPU="baseline"14MCPU="baseline"
15JOBS="-j$(nproc)"
1516
16rm -rf $PREFIX17rm -rf $PREFIX
17cd $HOME18cd $HOME
...@@ -49,21 +50,20 @@ cmake .. \...@@ -49,21 +50,20 @@ cmake .. \
49 -DCMAKE_BUILD_TYPE=Release \50 -DCMAKE_BUILD_TYPE=Release \
50 -DZIG_TARGET_TRIPLE="$TARGET" \51 -DZIG_TARGET_TRIPLE="$TARGET" \
51 -DZIG_TARGET_MCPU="$MCPU" \52 -DZIG_TARGET_MCPU="$MCPU" \
52 -DZIG_STATIC=ON \53 -DZIG_STATIC=ON
53 -GNinja
5454
55# Now cmake will use zig as the C/C++ compiler. We reset the environment variables55# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
56# so that installation and testing do not get affected by them.56# so that installation and testing do not get affected by them.
57unset CC57unset CC
58unset CXX58unset CXX
5959
60ninja install60make $JOBS install
6161
62# Here we rebuild zig but this time using the Zig binary we just now produced to62# Here we rebuild zig but this time using the Zig binary we just now produced to
63# build zig1.o rather than relying on the one built with stage0. See63# build zig1.o rather than relying on the one built with stage0. See
64# https://github.com/ziglang/zig/issues/6830 for more details.64# https://github.com/ziglang/zig/issues/6830 for more details.
65cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig"65cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig"
66ninja install66make $JOBS install
6767
68release/bin/zig build test -Denable-qemu -Denable-wasmtime68release/bin/zig build test -Denable-qemu -Denable-wasmtime
6969