commit db0e188f0e54fc5bdf5001d0f76b0af145f8473a (tree) parent 284f6baf1c1884b2c5d17fd9724fdb5913e63e4e Author: Andrew Kelley <andrew@ziglang.org> Date: Mon, 18 Mar 2019 18:36:35 -0400 update macos static build for llvm8 Diffstat:
| M | CMakeLists.txt | | | 4 | +--- |
| M | ci/azure/macos_script | | | 9 | +-------- |
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -56,10 +56,8 @@ endif() if(APPLE AND ZIG_STATIC) list(REMOVE_ITEM LLVM_LIBRARIES "-lz") - list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses") find_library(ZLIB NAMES z zlib libz) - find_library(LIBNCURSES NAMES libncurses.a) - list(APPEND LLVM_LIBRARIES "${LIBNCURSES}" "${ZLIB}") + list(APPEND LLVM_LIBRARIES "${ZLIB}") endif() set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") diff --git a/ci/azure/macos_script b/ci/azure/macos_script @@ -42,19 +42,12 @@ else rm $PREFIX/lib/libz*dylib cd $TMPDIR - wget ftp://ftp.invisible-island.net/ncurses/ncurses.tar.gz - tar xf ncurses.tar.gz - cd ncurses-6.1/ - ./configure --without-shared --prefix=$PREFIX - make $JOBS install - - cd $TMPDIR wget https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz tar xf llvm-8.0.0.src.tar.xz cd llvm-8.0.0.src/ mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly;AVR;RISCV" -DLLVM_ENABLE_LIBXML2=OFF + cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR;RISCV" -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_ENABLE_TERMINFO=OFF make $JOBS install cd $TMPDIR