authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-15 00:51:26-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-15 00:51:26-07:00
log996193c228af591f3793dce00a471161f8fb6695
tree384b54b36dc4f57a69bd1992ad8646eb30949086
parenta680c7ba982cfc98df6f9cb0e5e06f2839c706c3

ci: freebsd: don't try to compile with zig cc

1 files changed, 1 insertions(+), 22 deletions(-)

ci/srht/freebsd_script+1-22
...@@ -14,13 +14,6 @@ cd $HOME...@@ -14,13 +14,6 @@ cd $HOME
14wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"14wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
15tar xf "$CACHE_BASENAME.tar.xz"15tar xf "$CACHE_BASENAME.tar.xz"
1616
17ZIG="$PREFIX/bin/zig"
18NATIVE_LIBC_TXT="$HOME/native_libc.txt"
19$ZIG libc > "$NATIVE_LIBC_TXT"
20export ZIG_LIBC="$NATIVE_LIBC_TXT"
21export CC="$ZIG cc"
22export CXX="$ZIG c++"
23
24cd $ZIGDIR17cd $ZIGDIR
2518
26# Make the `zig version` number consistent.19# Make the `zig version` number consistent.
...@@ -41,22 +34,8 @@ cmake .. \...@@ -41,22 +34,8 @@ cmake .. \
41 -DCMAKE_PREFIX_PATH=$PREFIX \34 -DCMAKE_PREFIX_PATH=$PREFIX \
42 "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" \35 "-DCMAKE_INSTALL_PREFIX=$(pwd)/release" \
43 -DZIG_STATIC=ON \36 -DZIG_STATIC=ON \
44 -DZIG_TARGET_TRIPLE="x86_64-native-gnu" \37 -DZIG_TARGET_TRIPLE=x86_64-freebsd-gnu \
45 -DZIG_TARGET_MCPU="baseline" \
46 -GNinja38 -GNinja
47
48# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
49# so that installation and testing do not get affected by them.
50unset CC
51unset CXX
52unset ZIG_LIBC
53
54samu install
55
56# Here we rebuild zig but this time using the Zig binary we just now produced to
57# build zig1.o rather than relying on the one built with stage0. See
58# https://github.com/ziglang/zig/issues/6830 for more details.
59cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig" -DZIG_TARGET_MCPU="x86_64_v2"
60samu install39samu install
6140
62# Here we skip some tests to save time.41# Here we skip some tests to save time.