zig

commit ee1b37040484637b2c8136adf8cc7da833beddfc (tree)
parent a279cf81b2249ec7f5f7818fd0e3db3ce299853f
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu,  7 Jan 2021 00:38:48 -0700

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.

Diffstat:
M
ci/azure/linux_script
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ci/azure/linux_script b/ci/azure/linux_script
@@ -4,7 +4,7 @@ set -x
 set -e
 
 sudo apt-get update -q
-sudo apt-get install -y cmake s3cmd ninja-build tidy
+sudo apt-get install -y cmake s3cmd tidy
 
 ZIGDIR="$(pwd)"
 ARCH="$(uname -m)"
@@ -12,6 +12,7 @@ TARGET="$ARCH-linux-musl"
 CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.859+f1ef0a80f"
 PREFIX="$HOME/$CACHE_BASENAME"
 MCPU="baseline"
+JOBS="-j$(nproc)"
 
 rm -rf $PREFIX
 cd $HOME
@@ -49,21 +50,20 @@ cmake .. \
   -DCMAKE_BUILD_TYPE=Release \
   -DZIG_TARGET_TRIPLE="$TARGET" \
   -DZIG_TARGET_MCPU="$MCPU" \
-  -DZIG_STATIC=ON \
-  -GNinja
+  -DZIG_STATIC=ON
 
 # Now cmake will use zig as the C/C++ compiler. We reset the environment variables
 # so that installation and testing do not get affected by them.
 unset CC
 unset CXX
 
-ninja install
+make $JOBS install
 
 # Here we rebuild zig but this time using the Zig binary we just now produced to
 # build zig1.o rather than relying on the one built with stage0. See
 # https://github.com/ziglang/zig/issues/6830 for more details.
 cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig"
-ninja install
+make $JOBS install
 
 release/bin/zig build test -Denable-qemu -Denable-wasmtime