commit:     cc8063d4318a6594ac8ae94e99c2a6fe484198bd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 20:17:43 2019 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:13:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8063d4

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

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

 eclass/usr-ldscript.eclass | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass
index 2ad8c0901b1..1a115ca6a88 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
 

Reply via email to