From: stefson <herrtimson@yahoo.de>
Date: Mon, 2 Sep 2019 16:43:53 +0000 (+0200)
Subject: sys-libs/musl: fix leaking of host cflags into cross-musl
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2c3bb292bd123f58758554c23f2d56acae081885;p=gentoo.git

sys-libs/musl: fix leaking of host cflags into cross-musl

Closes: https://bugs.gentoo.org/667126

Signed-off-by: Steffen Kuhn <nielson2@yandex.com>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---

diff --git a/sys-libs/musl/musl-1.1.20-r1.ebuild b/sys-libs/musl/musl-1.1.20-r1.ebuild
index 13a18acc7023..f53b3b492f0a 100644
--- a/sys-libs/musl/musl-1.1.20-r1.ebuild
+++ b/sys-libs/musl/musl-1.1.20-r1.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_prepare() {
diff --git a/sys-libs/musl/musl-1.1.21.ebuild b/sys-libs/musl/musl-1.1.21.ebuild
index 7ce0d5e96bc4..1f4e2584ce79 100644
--- a/sys-libs/musl/musl-1.1.21.ebuild
+++ b/sys-libs/musl/musl-1.1.21.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.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 22f16fa8bfb0..0827b9d412bf 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() {