Mercurial > vanilla
diff lib/libc++abi/libc++abi.sh @ 745:59a2fa6992bc
vanilla: re-enable static libraries
author | David Demelier <markand@malikania.fr> |
---|---|
date | Wed, 07 Aug 2019 20:05:00 +0200 |
parents | c4039d2948b6 |
children | ddab65a5b3f5 |
line wrap: on
line diff
--- a/lib/libc++abi/libc++abi.sh Wed Aug 07 20:01:00 2019 +0200 +++ b/lib/libc++abi/libc++abi.sh Wed Aug 07 20:05:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MIT CUSTOM" PKGSUMMARY="low level support for the standard C++ library" PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/libcxxabi-$PKGVERSION.src.tar.xz" -PKGOPTIONS="COMPILER_RT LIBUNWIND STATIC" +PKGOPTIONS="COMPILER_RT LIBUNWIND" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -29,7 +29,6 @@ : ${CXXFLAGS:=-O2} : ${COMPILER_RT:=yes} : ${LIBUNWIND:=yes} -: ${STATIC:=no} if [ "$COMPILER_RT" = "yes" ]; then with_compiler_rt="-DLIBCXXABI_USE_COMPILER_RT=Off" @@ -43,12 +42,6 @@ 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 @@ -65,8 +58,7 @@ -DCMAKE_INSTALL_PREFIX= \ -DLIBCXXABI_LIBCXX_INCLUDES=/include/c++/v1 \ $with_compiler_rt \ - $with_libunwind \ - $with_static + $with_libunwind make make install DESTDIR=$DESTDIR mkdir -p $DESTDIR/include