From: Lionel Sambuc <lionel@minix3.org>
Date: Thu, 26 Sep 2013 09:52:57 +0000 (+0200)
Subject: Enable sys-root support in the native binutils
X-Git-Tag: v3.3.0~555
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=913340b559c704b74c6bcca4c8495150fc13c832;p=minix.git

Enable sys-root support in the native binutils

sysroot support was enabled only for cross versions of the binutils
tools.

This patch also activate it for the native tools which are installed
on the target system.

Change-Id: Ica5de7e20719a63f3b695477b767c30d0a93490c
---

diff --git a/external/gpl3/binutils/usr.bin/ld/Makefile b/external/gpl3/binutils/usr.bin/ld/Makefile
index 4e9bd9c0d..181d4c615 100644
--- a/external/gpl3/binutils/usr.bin/ld/Makefile
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile
@@ -101,14 +101,17 @@ EMUL_LIB_PATH.${f}=/usr/lib
 . endif
 
 # Binutils 2.22: the arguments have slightly changed.
-#ENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ @EMULATION_NAME@
+#ENSCRIPTS = LIB_PATH='${LIB_PATH}'
+#  $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}"
+#  @host@ @target@ @target_alias@
+#  "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ @enable_initfini_array@ @EMULATION_NAME@
 e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
 	${_MKTARGET_CREATE}
 	unset MACHINE || true; \
 	LIB_PATH=${EMUL_LIB_PATH.${f}} NATIVE=yes \
 		${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld ${LIBDIR} "/usr" "/usr/bin" \
 		${G_target_alias} ${G_target_alias} ${G_target_alias} \
-		${G_EMUL} ${LIBDIR} yes no ${f}
+		${G_EMUL} ${LIBDIR} yes yes ${f}
 
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
     ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"