From 7f9de4b9454635f16fc406c037464a4c9fd5ecf4 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 28 Aug 2017 03:32:43 -0400 Subject: [PATCH] travis: use external lld for apple since the binary I uploaded to build against has the LLD fixes --- ci/travis_osx_script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/travis_osx_script b/ci/travis_osx_script index 3620836120..42b4868a6f 100755 --- a/ci/travis_osx_script +++ b/ci/travis_osx_script @@ -9,7 +9,7 @@ export CXX=/usr/local/opt/gcc/bin/g++-7 echo $PATH mkdir build cd build -cmake .. -DCMAKE_PREFIX_PATH=$PREFIX_DIR -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) +cmake .. -DCMAKE_PREFIX_PATH=$PREFIX_DIR -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) -DZIG_FORCE_EXTERNAL_LLD=ON make VERBOSE=1 make install ./zig build --build-file ../build.zig test