Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/binutils/usr.bin/ld go back to only installing...



details:   https://anonhg.NetBSD.org/src/rev/aa3fee5decae
branches:  trunk
changeset: 818462:aa3fee5decae
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Oct 14 23:27:00 2016 +0000

description:
go back to only installing ldscripts for ports that need them (multi-abi)

diffstat:

 external/gpl3/binutils/usr.bin/ld/Makefile |  18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 78b835b6206b -r aa3fee5decae external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Fri Oct 14 20:34:29 2016 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Fri Oct 14 23:27:00 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2016/10/14 15:58:34 christos Exp $
+#      $NetBSD: Makefile,v 1.27 2016/10/14 23:27:00 mrg Exp $
 
 CPPFLAGS+=     -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
                -I${DIST}/ld \
@@ -92,12 +92,18 @@
                ${G_EMUL} ${LIBDIR} yes ${G_enable_initfini_array} \
                ${f} "${G_target_alias}"
 
-. for e in x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw
-.  if exists(ldscripts/${f}.${e})
+. if ${BINUTILS_MACHINE_ARCH} == "x86_64" || \
+    ${BINUTILS_MACHINE_ARCH} == "sparc64" || \
+    ${BINUTILS_MACHINE_ARCH} == "aarch64" || \
+    !empty(BINUTILS_MACHINE_ARCH:Mearm*) || \
+    !empty(BINUTILS_MACHINE_ARCH:Marm*) || \
+    !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
+.  for e in x xbn xc xd xdc xdw xn xr xs xsc xsw xu xw
+.   if exists(ldscripts/${f}.${e})
 FILES+= ${f}.${e}
-.  endif
-. endfor
-
+.   endif
+.  endfor
+. endif
 .endfor
 
 .include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index