From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 6 Sep 2015 01:31:38 +0000 (-0400)
Subject: sys-apps/systemd: Export toolchain vars
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a64d9f608b0b6f5f0dcbc0eea8bc20bf6ddd6dc;p=gentoo.git

sys-apps/systemd: Export toolchain vars

This prevents any i686 cross toolchain from being used for a multilib build.

Bug: https://bugs.gentoo.org/559726

Package-Manager: portage-2.2.20
---

diff --git a/sys-apps/systemd/systemd-225.ebuild b/sys-apps/systemd/systemd-225.ebuild
index 1a325de67930..8e44315bcf96 100644
--- a/sys-apps/systemd/systemd-225.ebuild
+++ b/sys-apps/systemd/systemd-225.ebuild
@@ -164,6 +164,9 @@ src_configure() {
 	# Fix systems broken by bug #509454.
 	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
 
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
 	multilib-minimal_src_configure
 }
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 1a325de67930..8e44315bcf96 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -164,6 +164,9 @@ src_configure() {
 	# Fix systems broken by bug #509454.
 	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
 
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
 	multilib-minimal_src_configure
 }