Module Name: src
Committed By: christos
Date: Thu Nov 13 02:31:24 UTC 2014
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
do the dependencies in a simpler way using a separate target
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/share/mk/bsd.kmodule.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.51 src/share/mk/bsd.kmodule.mk:1.52
--- src/share/mk/bsd.kmodule.mk:1.51 Wed Nov 12 20:09:59 2014
+++ src/share/mk/bsd.kmodule.mk Wed Nov 12 21:31:24 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.51 2014/11/13 01:09:59 uebayasi Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.52 2014/11/13 02:31:24 christos Exp $
# We are not building this with PIE
MKPIE=no
@@ -79,6 +79,7 @@ KMODSCRIPTSRC= ${DESTDIR}/usr/libdata/ld
.endif
.if ${MKLDSCRIPT} == "yes"
KMODSCRIPT= kldscript
+MKLDSCRIPTSH=
.else
KMODSCRIPT= ${KMODSCRIPTSRC}
.endif
@@ -106,14 +107,14 @@ NODPSRCS+= ${f}
${XOBJS}: ${DPSRCS}
.endif
-${PROG}: ${XOBJS} ${XSRCS} ${DPSRCS} ${DPADD} \
- ${"${MKLDSCRIPT}" == "yes":?$S/conf/mkldscript.sh ${KMODSCRIPTSRC}:}
- ${_MKTARGET_LINK}
.if ${MKLDSCRIPT} == "yes"
- @rm -f ${KMODSCRIPT}
+${KMODSCRIPT}: ${KMODSCRIPTSRC} ${XOBJS} $S/conf/mkldscript.sh
+ @rm -f ${.TARGET}
@OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
- -t ${KMODSCRIPTSRC} ${OBJS} > ${KMODSCRIPT}
+ -t ${KMODSCRIPTSRC} ${XOBJS} > ${.TARGET}
.endif
+
+${PROG}: ${XOBJS} ${XSRCS} ${DPSRCS} ${DPADD} ${KMODSCRIPT}
${CC} ${LDFLAGS} -nostdlib -MD -combine -r -Wl,-T,${KMODSCRIPT},-d \
-Wl,-Map=${.TARGET}.map \
-o ${.TARGET} ${CFLAGS} ${CPPFLAGS} ${XOBJS} \
@@ -125,6 +126,13 @@ OBJS+= ${SRCS:N*.h:N*.sh:R:S/$/.o/g}
${OBJS} ${LOBJS}: ${DPSRCS}
+.if ${MKLDSCRIPT} == "yes"
+${KMODSCRIPT}: ${KMODSCRIPTSRC} ${OBJS} $S/conf/mkldscript.sh
+ @rm -f ${.TARGET}
+ @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
+ -t ${KMODSCRIPTSRC} ${OBJS} > ${.TARGET}
+.endif
+
.if ${MACHINE_CPU} == "arm"
# The solution to limited branch space involves generating trampolines for
# those relocations while creating the module, as the resulting code will
@@ -161,14 +169,7 @@ ${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o
-o ${.TARGET} ${KMOD}_tmp.o ${KMOD}_tramp.o
.endif
.else
-${PROG}: ${OBJS} ${DPADD} \
- ${"${MKLDSCRIPT}" == "yes":?$S/conf/mkldscript.sh ${KMODSCRIPTSRC}:}
- ${_MKTARGET_LINK}
-.if ${MKLDSCRIPT} == "yes"
- @rm -f ${KMODSCRIPT}
- @OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
- -t ${KMODSCRIPTSRC} ${OBJS} > ${KMODSCRIPT}
-.endif
+${PROG}: ${OBJS} ${DPADD} ${KMODSCRIPT}
${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
-Wl,-Map=${.TARGET}.map \
-o ${.TARGET} ${OBJS}
