Revert "sys-libs/musl: back out of b94c385"

This reverts commit d3b662a5b4d652def877bc1ee55086182ee1c7c6.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 7db3e1cc384e8734fea3c0408ff0c1e17eecf03c..129c83020221c4fe5db1c8fe341b572bffd1c16d 100644 (file)
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
                *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
                esac
        fi
+
+       # fix for #667126, copied from glibc ebuild
+       # make sure host make.conf doesn't pollute us
+       if is_crosscompile || tc-is-cross-compiler ; then
+               CHOST=${CTARGET} strip-unsupported-flags
+       fi
 }
 
 src_configure() {

diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild
index 455b845402c8d176b5d46e227ddc33b098c173de..19c1029a045415de52b3466f852c34c6b297f093 100644 (file)
--- a/sys-libs/musl/musl-1.1.23.ebuild
+++ b/sys-libs/musl/musl-1.1.23.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
                *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
                esac
        fi
+
+       # fix for #667126, copied from glibc ebuild
+       # make sure host make.conf doesn't pollute us
+       if is_crosscompile || tc-is-cross-compiler ; then
+               CHOST=${CTARGET} strip-unsupported-flags
+       fi
 }
 
 src_configure() {

diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index 22f16fa8bfb09faa1d2b994f417d7950c3d2f65b..0827b9d412bf0cdf590a852df1be17d9a1b28cef 100644 (file)
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -52,6 +52,12 @@ pkg_setup() {
                *) die "Use sys-devel/crossdev to build a musl toolchain" ;;
                esac
        fi
+
+       # fix for #667126, copied from glibc ebuild
+       # make sure host make.conf doesn't pollute us
+       if is_crosscompile || tc-is-cross-compiler ; then
+               CHOST=${CTARGET} strip-unsupported-flags
+       fi
 }
 
 src_configure() {