Module Name: src
Committed By: joerg
Date: Wed Dec 8 02:04:13 UTC 2010
Modified Files:
src/share/mk: bsd.kmodule.mk bsd.prog.mk
Log Message:
gcc passes down -r directly to ld, so make it explicitly a linker option.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.252 -r1.253 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.24 src/share/mk/bsd.kmodule.mk:1.25
--- src/share/mk/bsd.kmodule.mk:1.24 Mon Jan 18 23:39:07 2010
+++ src/share/mk/bsd.kmodule.mk Wed Dec 8 02:04:13 2010
@@ -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
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.252 src/share/mk/bsd.prog.mk:1.253
--- src/share/mk/bsd.prog.mk:1.252 Wed Dec 8 01:57:22 2010
+++ src/share/mk/bsd.prog.mk Wed Dec 8 02:04:13 2010
@@ -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}
