Module Name: src
Committed By: joerg
Date: Mon Nov 11 10:24:53 UTC 2013
Modified Files:
src/share/mk: bsd.README bsd.prog.mk
Log Message:
Relink binaries if crti.o changes.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/share/mk/bsd.README
cvs rdiff -u -r1.285 -r1.286 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.README
diff -u src/share/mk/bsd.README:1.321 src/share/mk/bsd.README:1.322
--- src/share/mk/bsd.README:1.321 Mon Oct 28 01:47:13 2013
+++ src/share/mk/bsd.README Mon Nov 11 10:24:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.321 2013/10/28 01:47:13 mrg Exp $
+# $NetBSD: bsd.README,v 1.322 2013/11/11 10:24:53 joerg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1485,6 +1485,7 @@ DPADD Additional dependencies for the p
LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a
LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
+ LIBCRTI?= ${DESTDIR}/usr/lib/crti.o
LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a
LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.285 src/share/mk/bsd.prog.mk:1.286
--- src/share/mk/bsd.prog.mk:1.285 Sun Sep 29 14:36:25 2013
+++ src/share/mk/bsd.prog.mk Mon Nov 11 10:24:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.285 2013/09/29 14:36:25 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.286 2013/11/11 10:24:53 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -83,6 +83,11 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
.MADE: ${LIBCRT0}
.endif
+.ifndef LIBCRTI
+LIBCRTI= ${DESTDIR}/usr/lib/crti.o
+.MADE: ${LIBCRTI}
+.endif
+
##### Installed system library definitions
#
# E.g.
@@ -104,7 +109,6 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
c_pic \
com_err \
compat \
- crt0 \
crypt \
crypto \
crypto_idea \
@@ -476,7 +480,8 @@ NODPSRCS+= ${f}
.endif
.endfor
-${_P}: .gdbinit ${LIBCRT0} ${XOBJS.${_P}} ${SRCS.${_P}} ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
+${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \
+ ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
${_MKTARGET_LINK}
.if defined(DESTDIR)
${_CCLINK.${_P}} -Wl,-nostdlib \
@@ -509,7 +514,8 @@ CLEANFILES+= ${_P}.d
${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
-${_P}: .gdbinit ${LIBCRT0} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
+${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
+ ${LIBCRTEND} ${_DPADD.${_P}}
.if !commands(${_P})
${_MKTARGET_LINK}
${_CCLINK.${_P}} \
