diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2014-12-06 15:09:22 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2014-12-06 15:09:22 +0900 |
| commit | 4183886acc3a45f9e06f746e25bd6d4a713f589d (patch) | |
| tree | 4da77cc87b8838f05b2ea5e24de35270de9d8765 /sys-libs/glibc/files | |
| parent | sys-devel/crossdev: use github (diff) | |
| download | heroxbd-4183886acc3a45f9e06f746e25bd6d4a713f589d.tar.gz heroxbd-4183886acc3a45f9e06f746e25bd6d4a713f589d.tar.bz2 heroxbd-4183886acc3a45f9e06f746e25bd6d4a713f589d.zip | |
sys-libs/glibc: TPREFIX could not be leaked into ebuild environment.
Default to "" when cross-compiling.
Diffstat (limited to 'sys-libs/glibc/files')
| -rw-r--r-- | sys-libs/glibc/files/eblits/common.eblit | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit index 265e605..bb2ef63 100644 --- a/sys-libs/glibc/files/eblits/common.eblit +++ b/sys-libs/glibc/files/eblits/common.eblit @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.45 2014/10/18 23:09:51 vapier Exp $ -: ${TPREFIX:=${EPREFIX}} +: ${TPREFIX:=$(is_crosscompile && echo "" || echo ${EPREFIX})} # ROOT variable is not used in src_*; emulate that with $(alt_prefix root). # P:=Prefix X:=Cross-Triplet PX: Cross-Triplet-Prefix @@ -16,7 +16,8 @@ # ebuild helper ED/ /usr/CTARGET/TPREFIX /usr/CTARGET NULL $(alt_prefix) alt_prefix() { if is_crosscompile; then - echo -n "${EPREFIX}"/usr/${CTARGET} + [[ $1 == root ]] && echo -n ${EPREFIX} + echo -n /usr/${CTARGET} [[ $1 == root ]] || echo ${TPREFIX} fi } |