diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-26 11:42:28 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-26 11:42:28 +0000 |
commit | 89c6c06b8c42107dd231687a1012354e7d3039fc (patch) | |
tree | dad94f4da8a6694f3cb99f7048be2f9cf5f78f97 /sys-devel/binutils-config/files | |
parent | 796cae72cf9ed18ba01256ac1f83a686a2a76036 (diff) |
gentoo resync : 26.11.2017
Diffstat (limited to 'sys-devel/binutils-config/files')
-rwxr-xr-x | sys-devel/binutils-config/files/binutils-config-5 | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys-devel/binutils-config/files/binutils-config-5 b/sys-devel/binutils-config/files/binutils-config-5 index acb72b7e3435..e6c5fac00264 100755 --- a/sys-devel/binutils-config/files/binutils-config-5 +++ b/sys-devel/binutils-config/files/binutils-config-5 @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Format of /etc/env.d/binutils/: @@ -145,13 +145,17 @@ switch_profile() { cd "${ROOT}/${LIBPATH}" || exit 1 if [[ ${TARGET} == ${HOST} ]] ; then dstlib=${EROOT}/usr/${HOST}/lib + elif [[ -d ${EROOT}/usr/${TARGET}/lib ]] ; then + # true for at least avr and msp targets + dstlib=${EROOT}/usr/${TARGET}/lib else dstlib=${EROOT}/usr/${HOST}/${TARGET}/lib fi # When upgrading, we need to clean up ldscripts and libs. # Don't symlink back in the libs -- the binutils-lib package handles # these now. - # TODO: Stop requiring even the ldscripts symlink. + # TODO: Stop requiring even the ldscripts symlink, except + # we can't for bare-metal toolchains, so... bug #147155 mkdir -p "${dstlib}" rm -rf "${ROOT}/${BINPATH_LINKS}"/ldscripts atomic_ln "${LIBPATH}/ldscripts" "${dstlib}" "ldscripts" |