Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk sync both instances of the ldscript.
details: https://anonhg.NetBSD.org/src/rev/50b078eb39ff
branches: trunk
changeset: 333658:50b078eb39ff
user: christos <christos%NetBSD.org@localhost>
date: Wed Nov 12 19:33:32 2014 +0000
description:
sync both instances of the ldscript.
diffstat:
share/mk/bsd.kmodule.mk | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diffs (31 lines):
diff -r e9f067e2523f -r 50b078eb39ff share/mk/bsd.kmodule.mk
--- a/share/mk/bsd.kmodule.mk Wed Nov 12 19:31:05 2014 +0000
+++ b/share/mk/bsd.kmodule.mk Wed Nov 12 19:33:32 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.49 2014/11/12 13:24:34 christos Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.50 2014/11/12 19:33:32 christos Exp $
# We are not building this with PIE
MKPIE=no
@@ -109,7 +109,9 @@
${PROG}: ${XOBJS} ${XSRCS} ${DPSRCS} ${DPADD}
${_MKTARGET_LINK}
.if ${MKLDSCRIPT} == "yes"
- $S/conf/mkldscript.sh -t ${KMODSCRIPTSRC} ${XOBJS} > ${KMODSCRIPT}
+ @rm -f ${KMODSCRIPT}
+ @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
+ -t ${KMODSCRIPTSRC} ${OBJS} > ${KMODSCRIPT}
.endif
${CC} ${LDFLAGS} -nostdlib -MD -combine -r -Wl,-T,${KMODSCRIPT},-d \
-Wl,-Map=${.TARGET}.map \
@@ -162,8 +164,8 @@
${_MKTARGET_LINK}
.if ${MKLDSCRIPT} == "yes"
@rm -f ${KMODSCRIPT}
- @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh ${KMODSCRIPTSRC} ${OBJS} \
- > ${KMODSCRIPT}
+ @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
+ -t ${KMODSCRIPTSRC} ${OBJS} > ${KMODSCRIPT}
.endif
${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
-Wl,-Map=${.TARGET}.map \
Home |
Main Index |
Thread Index |
Old Index