From 0c8a9826516c810e6c9d146fb8c2dbb7f5bcd593 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Tue, 29 Mar 2016 19:47:28 +0200 Subject: [PATCH] libcxx: don't use libcxxabi on arm. --- srcpkgs/libcxx/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libcxx/template b/srcpkgs/libcxx/template index 6c2e4c846f4..e691aec8a54 100644 --- a/srcpkgs/libcxx/template +++ b/srcpkgs/libcxx/template @@ -1,15 +1,21 @@ # Template file for 'libcxx' pkgname=libcxx version=3.8.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="cmake" -configure_args="-DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" +case "$XBPS_TARGET_MACHINE" in +arm*) + # libcxxabi doesn't build on arm. + ;; +*) + configure_args+=" -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON" + makedepends="llvm-libunwind-devel libcxxabi-devel" + LDFLAGS="-Wl,--no-as-needed -lunwind -Wl,--as-needed" +esac case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES" esac -makedepends="llvm-libunwind-devel libcxxabi-devel" -LDFLAGS="-Wl,--no-as-needed -lunwind -Wl,--as-needed" make_build_args="VERBOSE=1" short_desc="New implementation of the C++ standard library, targeting C++11" maintainer="Juan RP "