diff lib/libc++abi/libc++abi.sh @ 649:c4039d2948b6

vanilla: upgrade LLVM toolchain to 8.0.1
author David Demelier <markand@malikania.fr>
date Sat, 27 Jul 2019 23:11:09 +0200
parents 25cecc6dca48
children 59a2fa6992bc
line wrap: on
line diff
--- a/lib/libc++abi/libc++abi.sh	Sat Jul 27 14:06:29 2019 +0200
+++ b/lib/libc++abi/libc++abi.sh	Sat Jul 27 23:11:09 2019 +0200
@@ -16,12 +16,12 @@
 #
 
 PKGNAME=libc++abi
-PKGVERSION=8.0.0
+PKGVERSION=8.0.1
 PKGREVISION=1
 PKGLICENSE="MIT CUSTOM"
 PKGSUMMARY="low level support for the standard C++ library"
-PKGDOWNLOAD="http://releases.llvm.org/$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz"
-PKGOPTIONS="COMPILER_RT LIBUNWIND"
+PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz"
+PKGOPTIONS="COMPILER_RT LIBUNWIND STATIC"
 
 : ${CC:=clang}
 : ${CFLAGS:=-O2}
@@ -29,6 +29,7 @@
 : ${CXXFLAGS:=-O2}
 : ${COMPILER_RT:=yes}
 : ${LIBUNWIND:=yes}
+: ${STATIC:=no}
 
 if [ "$COMPILER_RT" = "yes" ]; then
 	with_compiler_rt="-DLIBCXXABI_USE_COMPILER_RT=Off"
@@ -42,6 +43,12 @@
 	with_libunwind="-DLIBCXXABI_USE_LLVM_UNWINDER=Off"
 fi
 
+if [ "$STATIC" = "yes" ]; then
+	with_static="-DLIBCXXABI_ENABLE_SHARED=Off"
+else
+	with_static="-DLIBCXXABI_ENABLE_SHARED=On"
+fi
+
 build()
 {
 	rm -rf libcxxabi-$PKGVERSION.src
@@ -50,7 +57,6 @@
 
 	mkdir build && cd build
 	cmake .. \
-		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
@@ -59,7 +65,8 @@
 		-DCMAKE_INSTALL_PREFIX= \
 		-DLIBCXXABI_LIBCXX_INCLUDES=/include/c++/v1 \
 		$with_compiler_rt \
-		$with_libunwind
+		$with_libunwind \
+		$with_static
 	make
 	make install DESTDIR=$DESTDIR
 	mkdir -p $DESTDIR/include