authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-14 17:36:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-14 17:36:43-07:00
log540364e6c18e7acb744ba92b6d38dc1275fbcfa5
treeb84a7fef498c8aae28e178107d50ffe054d2f2a2
parentbf8cc73cf397338e24183b24cd4ef2a698160877

ci: macos: update to new cache tarball

This tarball contains LLVM, Clang, LLD, Zig, and libz.a for macOS. This is everything we need for the CI to produce a working Zig executable.

2 files changed, 17 insertions(+), 8 deletions(-)

CMakeLists.txt+5-1
...@@ -85,8 +85,12 @@ find_package(lld)...@@ -85,8 +85,12 @@ find_package(lld)
8585
86if(APPLE AND ZIG_STATIC)86if(APPLE AND ZIG_STATIC)
87 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")87 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
88 find_library(ZLIB NAMES z zlib libz)88 find_library(ZLIB NAMES libz.a z zlib libz)
89 list(APPEND LLVM_LIBRARIES "${ZLIB}")89 list(APPEND LLVM_LIBRARIES "${ZLIB}")
90
91 list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")
92 find_library(CURSES NAMES libcurses.a curses libcurses libncurses.a ncurses libncurses)
93 list(APPEND LLVM_LIBRARIES "${CURSES}")
90endif()94endif()
9195
92set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zigcpp")96set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zigcpp")
ci/azure/macos_script+12-7
...@@ -7,7 +7,7 @@ brew install s3cmd...@@ -7,7 +7,7 @@ brew install s3cmd
77
8ZIGDIR="$(pwd)"8ZIGDIR="$(pwd)"
9ARCH="x86_64"9ARCH="x86_64"
10CACHE_BASENAME="zig+llvm+lld+clang-$ARCH-macos-gnu-0.6.0+0f4386875f"10CACHE_BASENAME="zig+llvm+lld+clang-$ARCH-macos-gnu-0.6.0+1c9ef63a"
11PREFIX="$HOME/$CACHE_BASENAME"11PREFIX="$HOME/$CACHE_BASENAME"
12JOBS="-j2"12JOBS="-j2"
1313
...@@ -17,6 +17,9 @@ wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"...@@ -17,6 +17,9 @@ wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
17tar xf "$CACHE_BASENAME.tar.xz"17tar xf "$CACHE_BASENAME.tar.xz"
1818
19ZIG="$PREFIX/bin/zig"19ZIG="$PREFIX/bin/zig"
20NATIVE_LIBC_TXT="$HOME/native_libc.txt"
21$ZIG libc > "$NATIVE_LIBC_TXT"
22export ZIG_LIBC="$NATIVE_LIBC_TXT"
20export CC="$ZIG cc"23export CC="$ZIG cc"
21export CXX="$ZIG c++"24export CXX="$ZIG c++"
2225
...@@ -31,14 +34,16 @@ cd build...@@ -31,14 +34,16 @@ cd build
31cmake .. \34cmake .. \
32 -DCMAKE_INSTALL_PREFIX="$(pwd)/release" \35 -DCMAKE_INSTALL_PREFIX="$(pwd)/release" \
33 -DCMAKE_PREFIX_PATH="$PREFIX" \36 -DCMAKE_PREFIX_PATH="$PREFIX" \
34 -DCMAKE_CROSSCOMPILING=True \
35 -DCMAKE_SYSTEM_NAME="Darwin" \
36 -DCMAKE_AR="$PREFIX/bin/llvm-ar" \
37 -DCMAKE_RANLIB="$PREFIX/bin/llvm-ranlib" \
38 -DCMAKE_BUILD_TYPE=Release \37 -DCMAKE_BUILD_TYPE=Release \
39 -DZIG_TARGET_TRIPLE="$ARCH-macos.10.15.7-gnu" \38 -DZIG_TARGET_TRIPLE="$ARCH-native-gnu" \
40 -DZIG_TARGET_MCPU="baseline" \39 -DZIG_TARGET_MCPU="baseline" \
41 -DZIG_EXECUTABLE="$ZIG"40 -DZIG_EXECUTABLE="$ZIG" \
41 -DZIG_STATIC=ON
42
43# TODO unsetting this before `make install` is a workaround for Zig crashing
44# with "unable to exec C compiler".
45unset CC
46unset CXX
4247
43make $JOBS install48make $JOBS install
44release/bin/zig build test49release/bin/zig build test