From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 14 Jul 2019 20:17:43 +0000 (-0400)
Subject: usr-ldscript.eclass: return early if USE=split-usr is disabled
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=cc8063d4318a6594ac8ae94e99c2a6fe484198bd;p=gentoo.git

usr-ldscript.eclass: return early if USE=split-usr is disabled

Bug: https://bugs.gentoo.org/417451
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
index 2ad8c0901b19..1a115ca6a88c 100644
--- a/eclass/usr-ldscript.eclass
+++ b/eclass/usr-ldscript.eclass
@@ -11,6 +11,8 @@ _USR_LDSCRIPT_ECLASS=1
 
 inherit multilib toolchain-funcs
 
+IUSE="split-usr"
+
 # @FUNCTION: gen_usr_ldscript
 # @USAGE: [-a] <list of libs to create linker scripts for>
 # @DESCRIPTION:
@@ -41,7 +43,9 @@ gen_usr_ldscript() {
 	*-darwin*) ;;
 	*-android*) return 0 ;;
 	*linux*|*-freebsd*|*-openbsd*|*-netbsd*)
-		use prefix && return 0 ;;
+		use prefix && return 0
+		use split-usr || return 0
+		;;
 	*) return 0 ;;
 	esac