authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-07 00:18:28-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-07 00:18:28-07:00
loga279cf81b2249ec7f5f7818fd0e3db3ce299853f
tree7c09070a6f99ff6123562f9f572991afe494240e
parentce5222d945b4e1c3637f1673716bc224434da19a

ci: add missing target/mcpu args to zig cc

In the previous commit, I forgot to add these.

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

ci/azure/linux_script+7-5
......@@ -8,8 +8,10 @@ sudo apt-get install -y cmake s3cmd ninja-build tidy
88
99ZIGDIR="$(pwd)"
1010ARCH="$(uname -m)"
11CACHE_BASENAME="zig+llvm+lld+clang-$ARCH-linux-musl-0.8.0-dev.859+f1ef0a80f"
11TARGET="$ARCH-linux-musl"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.859+f1ef0a80f"
1213PREFIX="$HOME/$CACHE_BASENAME"
14MCPU="baseline"
1315
1416rm -rf $PREFIX
1517cd $HOME
......@@ -28,8 +30,8 @@ tar xf "$WASMTIME.tar.xz"
2830export PATH="$(pwd)/$WASMTIME:$PATH"
2931
3032ZIG="$PREFIX/bin/zig"
31export CC="$ZIG cc"
32export CXX="$ZIG c++"
33export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
34export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
3335
3436cd $ZIGDIR
3537
......@@ -45,8 +47,8 @@ cmake .. \
4547 -DCMAKE_INSTALL_PREFIX="$(pwd)/release" \
4648 -DCMAKE_PREFIX_PATH="$PREFIX" \
4749 -DCMAKE_BUILD_TYPE=Release \
48 -DZIG_TARGET_TRIPLE="$ARCH-linux-musl" \
49 -DZIG_TARGET_MCPU="baseline" \
50 -DZIG_TARGET_TRIPLE="$TARGET" \
51 -DZIG_TARGET_MCPU="$MCPU" \
5052 -DZIG_STATIC=ON \
5153 -GNinja
5254