[gentoo-commits] proj/crossdev:master commit in: /

[Steve Arnold]

commit:     575a4b1528fa27be50680011a544ca89f6e332e3
Author:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 17:54:27 2017 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 17:54:27 2017 +0000
URL:        https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=575a4b15

sys-devel/crossdev: Fix avr hack, move it inside doemerge block

Signed-off-by: Steve Arnold <nerdboy <AT> gentoo.org>

 crossdev | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/crossdev b/crossdev
index 8ba0360..048f82a 100755
--- a/crossdev
+++ b/crossdev
@@ -1293,15 +1293,16 @@ if ! ex_fast ; then
                USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \
                        doemerge ${GPKG} ${GPKG}-stage2
        fi
-fi
 
-# this is to make sure that avr linker can find its a**, er, ldscripts
-if [[ ${MAKE_SYMLINK} == "yes" ]] ; then
-       case ${CTARGET} in
-               avr*)   ln -s ${EPREFIX}/usr/$CHOST/${CTARGET}/lib/ldscripts 
${EPREFIX}/usr/${CTARGET}/lib/ldscripts
-                       ;;
-               *)      ;;
-       esac
+       # this is to make sure that avr linker can find its a**, er, ldscripts
+       if [[ ${MAKE_SYMLINK} == "yes" ]] ; then
+               case ${CTARGET} in
+                       avr*)   [[ -e ${EPREFIX}/usr/${CTARGET}/lib/ldscripts 
]] || \
+                                       ln -s 
${EPREFIX}/usr/$CHOST/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/
+                               ;;
+                       *)      ;;
+               esac
+       fi
 fi
 
 # all the extra things (like debuggers)