From: Anthony G. Basile <blueness@gentoo.org>
Date: Sat, 7 Sep 2019 14:22:27 +0000 (-0400)
Subject: Revert "sys-libs/musl: back out of b94c385"
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2f46d10f3bd4f1887e6ffae7b616b67875e8ebf9;p=gentoo.git

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 7db3e1cc384e..129c83020221 100644
--- 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 455b845402c8..19c1029a0454 100644
--- 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 22f16fa8bfb0..0827b9d412bf 100644
--- 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() {