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

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     cb22827620f16f8e29fdeb3654a7e5a846af517e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 10:51:11 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 10:51:11 2018 +0000
URL:        https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=cb228276

crossdev: revert ldscripts hack

Commit 03640757f2af1471324fc3e305f899f377d6409d
("add one more avr-specific hack")
added ${EPREFIX}/usr/${CTARGET}/lib/ldscripts symlink for avr targets.

The bug was not avr-specific but manifested only on avr ecause it's one
of rare targets that don't embed default inker scripts intofinal ld executable.

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b023986de7d466d361798bae98f45f8ba7a42e8a
fixed search path in binutils ebuild and we are safe to revert this change.

Bug: https://bugs.gentoo.org/147155
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 crossdev | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/crossdev b/crossdev
index a646158..0f64235 100755
--- a/crossdev
+++ b/crossdev
@@ -232,7 +232,6 @@ parse_target() {
 		      MULTILIB_USE="yes" #377039
 		      BUSE+=" cxx"
 		      STAGE_DEFAULT=${STAGE_LIBC}
-		      MAKE_SYMLINK="yes"
 		      WITH_DEF_HEADERS="no";;
 
 		# Has no glibc support yet (or even ABI defined). Can
@@ -549,7 +548,6 @@ uninstall() {
 	# clean out files from crossdev itself
 	[[ -e ${EPREFIX}/var/db/pkg/cross-${CTARGET} ]] && rmdir "${EPREFIX}"/var/db/pkg/cross-${CTARGET}
 	rm -f "${EPREFIX}"/usr/bin/${CTARGET}-{emerge,fix-root,pkg-config} "${EPREFIX}"/usr/bin/emerge-${CTARGET}
-	[[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && rm "${EPREFIX}"/usr/${CTARGET}/lib/ldscripts
 
 	for f in make.{conf,globals,profile} ; do
 		f="${EPREFIX}/usr/${CTARGET}/etc/${f}"
@@ -1395,16 +1393,6 @@ if ! ex_fast ; then
 		USE="${GUSE} ${USE} ${GUSE_DISABLE_STAGE_2}" \
 			doemerge ${GPKG} ${GPKG}-stage2
 	fi
-
-	# this is to make sure that avr linker can find its a**, er, ldscripts
-	if [[ ${MAKE_SYMLINK} == "yes" ]] ; then
-		case ${CTARGET} in
-			avr*)   ( ! [[ -h ${EPREFIX}/usr/${CTARGET}/lib/ldscripts ]] && [[ -d ${EPREFIX}/usr/${CTARGET}/lib ]] ) && \
-					ln -s ${EPREFIX}/usr/${HCHOST}/${CTARGET}/lib/ldscripts ${EPREFIX}/usr/${CTARGET}/lib/
-				;;
-			*)      ;;
-		esac
-	fi
 fi
 
 # all the extra things (like debuggers)