diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-29 02:53:24 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-29 02:53:24 +0000 |
| commit | b8ec9071f5d20d8518b02d0077428b2c9f88861b (patch) | |
| tree | 6214c0d63a2bd5ae464941924a90f415687fa63c /eclass/usr-ldscript.eclass | |
| parent | bdf6e70da7a28f45617c02a251bb6b3844202bc5 (diff) | |
gentoo auto-resync : 29:01:2023 - 02:53:24
Diffstat (limited to 'eclass/usr-ldscript.eclass')
| -rw-r--r-- | eclass/usr-ldscript.eclass | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/eclass/usr-ldscript.eclass b/eclass/usr-ldscript.eclass index b73d538ae5bb..6dbce59c6400 100644 --- a/eclass/usr-ldscript.eclass +++ b/eclass/usr-ldscript.eclass @@ -39,6 +39,13 @@ gen_usr_ldscript() { tc-is-static-only && return use prefix && return + # The toolchain's sysroot is automatically prepended to paths in this + # script. We therefore need to omit EPREFIX on standalone prefix (RAP) + # systems. prefix-guest (non-RAP) systems don't apply a sysroot so EPREFIX + # is still needed in that case. This is moot because the above line makes + # the function a noop on prefix, but we keep this in case that changes. + local prefix=$(usex prefix-guest "${EPREFIX}" "") + # 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 @@ -154,7 +161,7 @@ gen_usr_ldscript() { See bug https://bugs.gentoo.org/4411 for more info. */ ${output_format} - GROUP ( ${EPREFIX}/${libdir}/${tlib} ) + GROUP ( ${prefix}/${libdir}/${tlib} ) END_LDSCRIPT ;; esac |