Module Name: src
Committed By: matt
Date: Sun Jun 7 15:04:28 UTC 2015
Modified Files:
src/share/mk: bsd.gcc.mk bsd.prog.mk
Log Message:
Make LIBCRT* depend on the right files if MLIBDIR from MKCOMPAT is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/mk/bsd.gcc.mk
cvs rdiff -u -r1.291 -r1.292 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.gcc.mk
diff -u src/share/mk/bsd.gcc.mk:1.10 src/share/mk/bsd.gcc.mk:1.11
--- src/share/mk/bsd.gcc.mk:1.10 Mon Dec 10 23:49:39 2012
+++ src/share/mk/bsd.gcc.mk Sun Jun 7 15:04:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.gcc.mk,v 1.10 2012/12/10 23:49:39 pooka Exp $
+# $NetBSD: bsd.gcc.mk,v 1.11 2015/06/07 15:04:28 matt Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
@@ -21,14 +21,14 @@ _GCC_CRTN!= ${CC} --print-file-name=crt
_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
_GCC_LIBGCCDIR!= dirname `${CC} --print-libgcc-file-name`
.else
-_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o
-_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/crtbeginS.o
-_GCC_CRTEND?= ${DESTDIR}/usr/lib/crtend.o
-_GCC_CRTENDS?= ${DESTDIR}/usr/lib/crtendS.o
-_GCC_CRTI?= ${DESTDIR}/usr/lib/crti.o
-_GCC_CRTN?= ${DESTDIR}/usr/lib/crtn.o
-_GCC_CRTDIR?= ${DESTDIR}/usr/lib
-_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib
+_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbegin.o
+_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbeginS.o
+_GCC_CRTEND?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtend.o
+_GCC_CRTENDS?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtendS.o
+_GCC_CRTI?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
+_GCC_CRTN?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
+_GCC_CRTDIR?= ${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
+_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
.endif
.endif # ! defined(_BSD_GCC_MK_)
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.291 src/share/mk/bsd.prog.mk:1.292
--- src/share/mk/bsd.prog.mk:1.291 Mon Dec 1 01:34:30 2014
+++ src/share/mk/bsd.prog.mk Sun Jun 7 15:04:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.291 2014/12/01 01:34:30 erh Exp $
+# $NetBSD: bsd.prog.mk,v 1.292 2015/06/07 15:04:28 matt Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -72,22 +72,22 @@ CTFMFLAGS+= -g
# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
.ifndef LIBCRTBEGIN
-LIBCRTBEGIN= ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
+LIBCRTBEGIN= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o ${_GCC_CRTBEGIN}
.MADE: ${LIBCRTBEGIN}
.endif
.ifndef LIBCRTEND
-LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o
+LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
.MADE: ${LIBCRTEND}
.endif
_SHLINKER= ${SHLINKDIR}/ld.elf_so
.ifndef LIBCRT0
-LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
+LIBCRT0= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crt0.o
.MADE: ${LIBCRT0}
.endif
.ifndef LIBCRTI
-LIBCRTI= ${DESTDIR}/usr/lib/crti.o
+LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
.MADE: ${LIBCRTI}
.endif
