| author |  Andrew Kelley <andrew@ziglang.org> 2019-03-18 18:36:35-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2019-03-18 18:36:35-04:00 |
| log | db0e188f0e54fc5bdf5001d0f76b0af145f8473a |
| tree | cf68189a94da538360e7f015c39867781a385f88 |
| parent | 284f6baf1c1884b2c5d17fd9724fdb5913e63e4e |
update macos static build for llvm8
2 files changed, 2 insertions(+), 11 deletions(-)
- CMakeLists.txt
ci
azure
CMakeLists.txt+1-3
| ... | @@ -56,10 +56,8 @@ endif() | ... | @@ -56,10 +56,8 @@ endif() |
| 56 | 56 | ||
| 57 | if(APPLE AND ZIG_STATIC) | 57 | if(APPLE AND ZIG_STATIC) |
| 58 | list(REMOVE_ITEM LLVM_LIBRARIES "-lz") | 58 | list(REMOVE_ITEM LLVM_LIBRARIES "-lz") |
| 59 | list(REMOVE_ITEM LLVM_LIBRARIES "-lcurses") | ||
| 60 | find_library(ZLIB NAMES z zlib libz) | 59 | find_library(ZLIB NAMES z zlib libz) |
| 61 | find_library(LIBNCURSES NAMES libncurses.a) | 60 | list(APPEND LLVM_LIBRARIES "${ZLIB}") |
| 62 | list(APPEND LLVM_LIBRARIES "${LIBNCURSES}" "${ZLIB}") | ||
| 63 | endif() | 61 | endif() |
| 64 | 62 | ||
| 65 | set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") | 63 | set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") |
ci/azure/macos_script+1-8
| ... | @@ -41,20 +41,13 @@ else | ... | @@ -41,20 +41,13 @@ else |
| 41 | make $JOBS install | 41 | make $JOBS install |
| 42 | rm $PREFIX/lib/libz*dylib | 42 | rm $PREFIX/lib/libz*dylib |
| 43 | 43 | ||
| 44 | cd $TMPDIR | ||
| 45 | wget ftp://ftp.invisible-island.net/ncurses/ncurses.tar.gz | ||
| 46 | tar xf ncurses.tar.gz | ||
| 47 | cd ncurses-6.1/ | ||
| 48 | ./configure --without-shared --prefix=$PREFIX | ||
| 49 | make $JOBS install | ||
| 50 | |||
| 51 | cd $TMPDIR | 44 | cd $TMPDIR |
| 52 | wget https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz | 45 | wget https://releases.llvm.org/8.0.0/llvm-8.0.0.src.tar.xz |
| 53 | tar xf llvm-8.0.0.src.tar.xz | 46 | tar xf llvm-8.0.0.src.tar.xz |
| 54 | cd llvm-8.0.0.src/ | 47 | cd llvm-8.0.0.src/ |
| 55 | mkdir build | 48 | mkdir build |
| 56 | cd build | 49 | cd build |
| 57 | 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 | 50 | 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 |
| 58 | make $JOBS install | 51 | make $JOBS install |
| 59 | 52 | ||
| 60 | cd $TMPDIR | 53 | cd $TMPDIR |