Skip to content

Commit ee1b370

Browse files
committed
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 parent a279cf8 commit ee1b370

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ci/azure/linux_script

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ set -x
44
set -e
55

66
sudo apt-get update -q
7-
sudo apt-get install -y cmake s3cmd ninja-build tidy
7+
sudo apt-get install -y cmake s3cmd tidy
88

99
ZIGDIR="$(pwd)"
1010
ARCH="$(uname -m)"
1111
TARGET="$ARCH-linux-musl"
1212
CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.859+f1ef0a80f"
1313
PREFIX="$HOME/$CACHE_BASENAME"
1414
MCPU="baseline"
15+
JOBS="-j$(nproc)"
1516

1617
rm -rf $PREFIX
1718
cd $HOME
@@ -49,21 +50,20 @@ cmake .. \
4950
-DCMAKE_BUILD_TYPE=Release \
5051
-DZIG_TARGET_TRIPLE="$TARGET" \
5152
-DZIG_TARGET_MCPU="$MCPU" \
52-
-DZIG_STATIC=ON \
53-
-GNinja
53+
-DZIG_STATIC=ON
5454

5555
# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
5656
# so that installation and testing do not get affected by them.
5757
unset CC
5858
unset CXX
5959

60-
ninja install
60+
make $JOBS install
6161

6262
# Here we rebuild zig but this time using the Zig binary we just now produced to
6363
# build zig1.o rather than relying on the one built with stage0. See
6464
# https://github.com/ziglang/zig/issues/6830 for more details.
6565
cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig"
66-
ninja install
66+
make $JOBS install
6767

6868
release/bin/zig build test -Denable-qemu -Denable-wasmtime
6969

0 commit comments

Comments
 (0)