Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Relink binaries if crti.o changes.



details:   https://anonhg.NetBSD.org/src/rev/6754f52359c4
branches:  trunk
changeset: 791271:6754f52359c4
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Nov 11 10:24:53 2013 +0000

description:
Relink binaries if crti.o changes.

diffstat:

 share/mk/bsd.README  |   3 ++-
 share/mk/bsd.prog.mk |  14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (66 lines):

diff -r 5c9dd86f18bd -r 6754f52359c4 share/mk/bsd.README
--- a/share/mk/bsd.README       Mon Nov 11 10:24:27 2013 +0000
+++ b/share/mk/bsd.README       Mon Nov 11 10:24:53 2013 +0000
@@ -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 @@
                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
diff -r 5c9dd86f18bd -r 6754f52359c4 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Mon Nov 11 10:24:27 2013 +0000
+++ b/share/mk/bsd.prog.mk      Mon Nov 11 10:24:53 2013 +0000
@@ -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 @@
 .MADE: ${LIBCRT0}
 .endif
 
+.ifndef LIBCRTI
+LIBCRTI=       ${DESTDIR}/usr/lib/crti.o
+.MADE: ${LIBCRTI}
+.endif
+
 ##### Installed system library definitions
 #
 #      E.g.
@@ -104,7 +109,6 @@
        c_pic \
        com_err \
        compat \
-       crt0 \
        crypt \
        crypto \
        crypto_idea \
@@ -476,7 +480,8 @@
 .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 @@
 
 ${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}} \



Home | Main Index | Thread Index | Old Index