summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-03-30 17:56:57 -0400
committerMike Frysinger <vapier@gentoo.org>2016-03-30 18:34:33 -0400
commit838c3028555eb9d8f12017dcf43f0c7b0c8af90f (patch)
tree00d3eda6d5617ef96ac1fac3c65fccf4a6824baf /eclass
parentwww-client/google-chrome-beta: automated update (diff)
downloadgentoo-838c3028555eb9d8f12017dcf43f0c7b0c8af90f.tar.gz
gentoo-838c3028555eb9d8f12017dcf43f0c7b0c8af90f.tar.bz2
gentoo-838c3028555eb9d8f12017dcf43f0c7b0c8af90f.zip
toolchain-funcs.eclass: gen_usr_ldscript: integrate multilib_is_native_abi support #479448
Many ebuilds have started checking multilib_is_native_abi to see if they should call gen_usr_ldscript. Since that logic always makes sense, add it directly to the gen_usr_ldscript function.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain-funcs.eclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 59c28617aec4..cf95d04ad66c 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -722,6 +722,11 @@ gen_usr_ldscript() {
tc-is-static-only && return
+ # We only care about stuffing / for the native ABI. #479448
+ if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then
+ multilib_is_native_abi || return 0
+ fi
+
# Eventually we'd like to get rid of this func completely #417451
case ${CTARGET:-${CHOST}} in
*-darwin*) ;;