authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-03 02:13:37-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2021-06-03 02:13:37-04:00
log87dae0ce98fde1957a9290c22866b3101ce419d8
tree882bd176cfa914046154347b68e0adedf6af8bbf
parentd1f60a63bdd7bd838c210a888dfe23c9ea9f2669
parent05cd8936c885d2b538091eb814724472c73ec8b8
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #8932 from ziglang/llvm-needs-zlib

cmake: LLVM needs to link against zlib

10 files changed, 66 insertions(+), 21 deletions(-)

CMakeLists.txt+7-3
......@@ -67,6 +67,7 @@ message("Configuring zig version ${ZIG_VERSION}")
6767
6868set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)")
6969set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")
70set(ZIG_STATIC_ZLIB off CACHE BOOL "Prefer linking against static zlib")
7071set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")
7172set(ZIG_USE_CCACHE off CACHE BOOL "Use ccache if available")
7273
......@@ -75,7 +76,8 @@ if(CCACHE_PROGRAM AND ZIG_USE_CCACHE)
7576endif()
7677
7778if(ZIG_STATIC)
78 set(ZIG_STATIC_LLVM "on")
79 set(ZIG_STATIC_LLVM ON)
80 set(ZIG_STATIC_ZLIB ON)
7981endif()
8082
8183string(REGEX REPLACE "\\\\" "\\\\\\\\" ZIG_LIBC_LIB_DIR_ESCAPED "${ZIG_LIBC_LIB_DIR}")
......@@ -101,11 +103,13 @@ find_package(llvm)
101103find_package(clang)
102104find_package(lld)
103105
104if(APPLE AND ZIG_STATIC)
106if(ZIG_STATIC_ZLIB)
105107 list(REMOVE_ITEM LLVM_LIBRARIES "-lz")
106 find_library(ZLIB NAMES libz.a z zlib libz)
108 find_library(ZLIB NAMES libz.a libzlibstatic.a z zlib libz)
107109 list(APPEND LLVM_LIBRARIES "${ZLIB}")
110endif()
108111
112if(APPLE AND ZIG_STATIC)
109113 list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses")
110114 find_library(CURSES NAMES libcurses.a curses libcurses libncurses.a ncurses libncurses)
111115 list(APPEND LLVM_LIBRARIES "${CURSES}")
ci/azure/linux_script+1-1
......@@ -9,7 +9,7 @@ sudo apt-get install -y cmake s3cmd tidy
99ZIGDIR="$(pwd)"
1010ARCH="$(uname -m)"
1111TARGET="$ARCH-linux-musl"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2168+2d1196773"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2703+c12704a33"
1313PREFIX="$HOME/$CACHE_BASENAME"
1414MCPU="baseline"
1515JOBS="-j$(nproc)"
ci/azure/macos_arm64_script+3-3
......@@ -10,13 +10,13 @@ ZIGDIR="$(pwd)"
1010HOST_ARCH="x86_64"
1111HOST_TARGET="$HOST_ARCH-macos-gnu"
1212HOST_MCPU="baseline"
13HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.8.0-dev.2168+2d1196773"
13HOST_CACHE_BASENAME="zig+llvm+lld+clang-$HOST_TARGET-0.8.0-dev.2703+c12704a33"
1414HOST_PREFIX="$HOME/$HOST_CACHE_BASENAME"
1515
1616ARCH="aarch64"
1717TARGET="$ARCH-macos-gnu"
18MCPU="cyclone"
19CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2168+2d1196773"
18MCPU="apple_a14"
19CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2703+c12704a33"
2020PREFIX="$HOME/$CACHE_BASENAME"
2121
2222JOBS="-j2"
ci/azure/macos_script+1-1
......@@ -9,7 +9,7 @@ ZIGDIR="$(pwd)"
99ARCH="x86_64"
1010TARGET="$ARCH-macos-gnu"
1111MCPU="baseline"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2168+2d1196773"
12CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.8.0-dev.2703+c12704a33"
1313PREFIX="$HOME/$CACHE_BASENAME"
1414JOBS="-j2"
1515
ci/azure/windows_msvc_install+2-2
......@@ -7,5 +7,5 @@ pacman -Suy --needed --noconfirm
77pacman -S --needed --noconfirm wget p7zip python3-pip tar xz
88
99pip install s3cmd
10wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-12.0.0-x86_64-windows-msvc-release-mt.tar.xz"
11tar xf llvm+clang+lld-12.0.0-x86_64-windows-msvc-release-mt.tar.xz
10wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-12.0.1-rc1-x86_64-windows-msvc-release-mt.tar.xz"
11tar xf llvm+clang+lld-12.0.1-rc1-x86_64-windows-msvc-release-mt.tar.xz
ci/azure/windows_msvc_script.bat+1-1
......@@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%"
1111
1212SET "ZIGBUILDDIR=%SRCROOT%\build"
1313SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-12.0.0-x86_64-windows-msvc-release-mt"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-12.0.1-rc1-x86_64-windows-msvc-release-mt"
1515
1616call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
1717
ci/drone/drone.yml+5-5
......@@ -7,28 +7,28 @@ platform:
77
88steps:
99- name: build
10 image: ziglang/static-base:llvm12-aarch64-2
10 image: ziglang/static-base:llvm12-aarch64-5
1111 commands:
1212 - ./ci/drone/linux_script_build
1313
1414- name: test-1
1515 depends_on:
1616 - build
17 image: ziglang/static-base:llvm12-aarch64-2
17 image: ziglang/static-base:llvm12-aarch64-5
1818 commands:
1919 - ./ci/drone/linux_script_test 1
2020
2121- name: test-2
2222 depends_on:
2323 - build
24 image: ziglang/static-base:llvm12-aarch64-2
24 image: ziglang/static-base:llvm12-aarch64-5
2525 commands:
2626 - ./ci/drone/linux_script_test 2
2727
2828- name: test-3
2929 depends_on:
3030 - build
31 image: ziglang/static-base:llvm12-aarch64-2
31 image: ziglang/static-base:llvm12-aarch64-5
3232 commands:
3333 - ./ci/drone/linux_script_test 3
3434
......@@ -38,7 +38,7 @@ steps:
3838 - test-1
3939 - test-2
4040 - test-3
41 image: ziglang/static-base:llvm12-aarch64-2
41 image: ziglang/static-base:llvm12-aarch64-5
4242 environment:
4343 SRHT_OAUTH_TOKEN:
4444 from_secret: SRHT_OAUTH_TOKEN
ci/drone/linux_script_build+44-3
......@@ -2,8 +2,30 @@
22
33. ./ci/drone/linux_script_base
44
5apk update
6apk add samurai
5PREFIX="/deps/local"
6ZIG="$PREFIX/bin/zig"
7TARGET="$TRIPLEARCH-linux-musl"
8MCPU="baseline"
9
10export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
11export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
12
13# The `CMAKE_AR` parameter will consider any spaces to
14# be part of the executable path rather than CLI args, so we have
15# to create wrapper scripts for `zig ar` and zig ranlib`.
16
17cat <<'ENDFILE' >$PREFIX/bin/ar
18#!/bin/sh
19/deps/local/bin/zig ar $@
20ENDFILE
21
22cat <<'ENDFILE' >$PREFIX/bin/ranlib
23#!/bin/sh
24/deps/local/bin/zig ranlib $@
25ENDFILE
26
27chmod +x $PREFIX/bin/ar
28chmod +x $PREFIX/bin/ranlib
729
830# Make the `zig version` number consistent.
931# This will affect the cmake command below.
......@@ -13,6 +35,25 @@ git fetch --tags
1335
1436mkdir build
1537cd build
16cmake .. -DCMAKE_BUILD_TYPE=Release "-DCMAKE_INSTALL_PREFIX=$DISTDIR" -DZIG_STATIC=ON -DCMAKE_PREFIX_PATH=/deps/local -GNinja
38cmake .. \
39 -DCMAKE_INSTALL_PREFIX="$DISTDIR" \
40 -DCMAKE_PREFIX_PATH="$PREFIX" \
41 -DCMAKE_BUILD_TYPE=Release \
42 -DCMAKE_AR="$PREFIX/bin/ar" \
43 -DCMAKE_RANLIB="$PREFIX/bin/ranlib" \
44 -DZIG_TARGET_TRIPLE="$TARGET" \
45 -DZIG_TARGET_MCPU="$MCPU" \
46 -DZIG_STATIC=ON \
47 -GNinja
48
49# Now CMake will use Zig as the C/C++ compiler. We reset the environment variables
50# so that installation and testing do not get affected by them.
51unset CC
52unset CXX
53samu install
1754
55# Here we rebuild Zig but this time using the Zig binary we just now produced to
56# build zig1.o rather than relying on the one built with stage0. See
57# https://github.com/ziglang/zig/issues/6830 for more details.
58cmake .. -DZIG_EXECUTABLE="$DISTDIR/bin/zig"
1859samu install
ci/drone/linux_script_finalize+1-1
......@@ -7,7 +7,7 @@ if [ -n "$DRONE_PULL_REQUEST" ]; then
77fi
88
99apk update
10apk add py3-pip xz perl-utils jq curl samurai
10apk add py3-pip perl-utils jq curl
1111pip3 install s3cmd
1212
1313cd build
ci/srht/freebsd_script+1-1
......@@ -7,7 +7,7 @@ sudo pkg update -fq
77sudo pkg install -y cmake py38-s3cmd wget curl jq samurai
88
99ZIGDIR="$(pwd)"
10CACHE_BASENAME="zig+llvm+lld+clang-x86_64-freebsd-gnu-0.8.0-dev.1939+5a3ea9bec"
10CACHE_BASENAME="zig+llvm+lld+clang-x86_64-freebsd-gnu-0.8.0-dev.2703+c12704a33"
1111PREFIX="$HOME/$CACHE_BASENAME"
1212
1313cd $HOME