From c74963d9cd47713ff9d137d380f778364dd19d36 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Wed, 21 Dec 2016 07:30:07 +0100 Subject: [PATCH] gcc: fix i686-musl target For i686-musl GCC's libmpx target does not compile. For now simply remove the libmpx subdirectory. TODO: investigate why libmpx compiles for i686 but not for i686-musl. --- srcpkgs/gcc/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 9c3423b5255..2b464ded0f6 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -74,7 +74,7 @@ case "$XBPS_TARGET_MACHINE" in esac case "$XBPS_TARGET_MACHINE" in mips*) ;; - x86_64*|i686*) subpackages+=" libitm libitm-devel libmpx libmpx-devel";; + x86_64*|i686) subpackages+=" libitm libitm-devel libmpx libmpx-devel";; *) subpackages+=" libitm libitm-devel";; esac @@ -150,6 +150,10 @@ do_configure() { case "$XBPS_TARGET_MACHINE" in *-musl) _args+=" --disable-symvers" _args+=" libat_cv_have_ifunc=no" + if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then + # Remove libmpx because it won't compile + rm -rf libmpx + fi ;; esac