Source-Changes-HG archive

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

[src/trunk]: src/share/mk gcc passes down -r directly to ld, so make it expli...



details:   https://anonhg.NetBSD.org/src/rev/351e4da2ea60
branches:  trunk
changeset: 759393:351e4da2ea60
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Dec 08 02:04:13 2010 +0000

description:
gcc passes down -r directly to ld, so make it explicitly a linker option.

diffstat:

 share/mk/bsd.kmodule.mk |  4 ++--
 share/mk/bsd.prog.mk    |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r e1795ecb8e34 -r 351e4da2ea60 share/mk/bsd.kmodule.mk
--- a/share/mk/bsd.kmodule.mk   Wed Dec 08 01:57:22 2010 +0000
+++ b/share/mk/bsd.kmodule.mk   Wed Dec 08 02:04:13 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.kmodule.mk,v 1.24 2010/01/18 23:39:07 jmmv Exp $
+#      $NetBSD: bsd.kmodule.mk,v 1.25 2010/12/08 02:04:13 joerg Exp $
 
 # We are not building this with PIE
 MKPIE=no
@@ -55,7 +55,7 @@
 
 ${PROG}: ${OBJS} ${DPADD}
        ${_MKTARGET_LINK}
-       ${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
+       ${CC} ${LDFLAGS} -nostdlib -Wl,-r -Wl,-T,${KMODSCRIPT},-d \
                -o ${.TARGET} ${OBJS}
 
 ##### Install rules
diff -r e1795ecb8e34 -r 351e4da2ea60 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Wed Dec 08 01:57:22 2010 +0000
+++ b/share/mk/bsd.prog.mk      Wed Dec 08 02:04:13 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.252 2010/12/08 01:57:22 joerg Exp $
+#      $NetBSD: bsd.prog.mk,v 1.253 2010/12/08 02:04:13 joerg Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -310,7 +310,7 @@
 
 ${_P}.ro: ${OBJS.${_P}} ${DPADD}
        ${_MKTARGET_LINK}
-       ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
+       ${CC} ${LDFLAGS} -nostdlib -Wl,-r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
 
 .if defined(_PROGDEBUG.${_P})
 ${_PROGDEBUG.${_P}}: ${_P}



Home | Main Index | Thread Index | Old Index