Commit db0e188f0e

Andrew Kelley <andrew@ziglang.org>
2019-03-18 23:36:35
update macos static build for llvm8
1 parent 284f6ba
Changed files (2)
ci/azure/macos_script
@@ -41,20 +41,13 @@ else
   make $JOBS install
   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
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")