Module Name: src
Committed By: joerg
Date: Fri Dec 10 20:08:17 UTC 2010
Modified Files:
src/share/mk: bsd.prog.mk
Log Message:
Revert last, gcc(1) checks explicitly for -r on some platforms to disable
passing down --relax as well.
To generate a diff of this commit:
cvs rdiff -u -r1.253 -r1.254 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.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.253 src/share/mk/bsd.prog.mk:1.254
--- src/share/mk/bsd.prog.mk:1.253 Wed Dec 8 02:04:13 2010
+++ src/share/mk/bsd.prog.mk Fri Dec 10 20:08:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.253 2010/12/08 02:04:13 joerg Exp $
+# $NetBSD: bsd.prog.mk,v 1.254 2010/12/10 20:08:17 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 -Wl,-r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
+ ${CC} ${LDFLAGS} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
.if defined(_PROGDEBUG.${_P})
${_PROGDEBUG.${_P}}: ${_P}
