authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-05-10 12:17:32+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-05-10 13:55:48+02:00
log603242fa8604bf237b48c2dfd70c1a43f0ce8def
tree44363a1d4fe20862357bca27d29d5678de449678
parent9c03b39d1ebb52a94f1e6ee6f92a19f54a0ee528

Use zig-bootstrapped x86_64 macos compiler in CI


1 files changed, 9 insertions(+), 10 deletions(-)

ci/azure/macos_script+9-10
......@@ -7,21 +7,21 @@ brew update && brew install s3cmd
77
88ZIGDIR="$(pwd)"
99ARCH="x86_64"
10CACHE_BASENAME="zig+llvm+lld+clang-$ARCH-macos-gnu-0.8.0-dev.1939+5a3ea9bec"
10TARGET="$ARCH-macos-gnu"
11CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2168+2d1196773"
1112PREFIX="$HOME/$CACHE_BASENAME"
13MCPU="baseline"
1214JOBS="-j2"
1315
1416rm -rf $PREFIX
1517cd $HOME
18
1619wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
1720tar xf "$CACHE_BASENAME.tar.xz"
1821
1922ZIG="$PREFIX/bin/zig"
20NATIVE_LIBC_TXT="$HOME/native_libc.txt"
21$ZIG libc >"$NATIVE_LIBC_TXT"
22export ZIG_LIBC="$NATIVE_LIBC_TXT"
23export CC="$ZIG cc"
24export CXX="$ZIG c++"
23export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
24export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
2525
2626cd $ZIGDIR
2727
......@@ -37,22 +37,21 @@ cmake .. \
3737 -DCMAKE_INSTALL_PREFIX="$(pwd)/release" \
3838 -DCMAKE_PREFIX_PATH="$PREFIX" \
3939 -DCMAKE_BUILD_TYPE=Release \
40 -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \
41 -DZIG_TARGET_MCPU="baseline" \
40 -DZIG_TARGET_TRIPLE="$TARGET" \
41 -DZIG_TARGET_MCPU="$MCPU" \
4242 -DZIG_STATIC=ON
4343
4444# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
4545# so that installation and testing do not get affected by them.
4646unset CC
4747unset CXX
48unset ZIG_LIBC
4948
5049make $JOBS install
5150
5251# Here we rebuild zig but this time using the Zig binary we just now produced to
5352# build zig1.o rather than relying on the one built with stage0. See
5453# https://github.com/ziglang/zig/issues/6830 for more details.
55cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig" -DZIG_TARGET_MCPU="x86_64_v2"
54cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig"
5655make $JOBS install
5756
5857for step in test-toolchain test-std docs; do