From a279cf81b2249ec7f5f7818fd0e3db3ce299853f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 7 Jan 2021 00:18:28 -0700 Subject: [PATCH] ci: add missing target/mcpu args to zig cc In the previous commit, I forgot to add these. --- ci/azure/linux_script | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/azure/linux_script b/ci/azure/linux_script index d8349de149..8e3f0b7603 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -8,8 +8,10 @@ sudo apt-get install -y cmake s3cmd ninja-build tidy ZIGDIR="$(pwd)" ARCH="$(uname -m)" -CACHE_BASENAME="zig+llvm+lld+clang-$ARCH-linux-musl-0.8.0-dev.859+f1ef0a80f" +TARGET="$ARCH-linux-musl" +CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.859+f1ef0a80f" PREFIX="$HOME/$CACHE_BASENAME" +MCPU="baseline" rm -rf $PREFIX cd $HOME @@ -28,8 +30,8 @@ tar xf "$WASMTIME.tar.xz" export PATH="$(pwd)/$WASMTIME:$PATH" ZIG="$PREFIX/bin/zig" -export CC="$ZIG cc" -export CXX="$ZIG c++" +export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" +export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" cd $ZIGDIR @@ -45,8 +47,8 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX="$(pwd)/release" \ -DCMAKE_PREFIX_PATH="$PREFIX" \ -DCMAKE_BUILD_TYPE=Release \ - -DZIG_TARGET_TRIPLE="$ARCH-linux-musl" \ - -DZIG_TARGET_MCPU="baseline" \ + -DZIG_TARGET_TRIPLE="$TARGET" \ + -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -GNinja