Module Name: src
Committed By: joerg
Date: Wed May 9 13:18:53 UTC 2018
Modified Files:
src/share/mk: bsd.gcc.mk
Log Message:
Drop checks for EXTERNAL_TOOLCHAIN for crt*.o. We've been using our own
versions for a long time and haven't relied on external files as such.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/mk/bsd.gcc.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.11 src/share/mk/bsd.gcc.mk:1.12
--- src/share/mk/bsd.gcc.mk:1.11 Sun Jun 7 15:04:28 2015
+++ src/share/mk/bsd.gcc.mk Wed May 9 13:18:53 2018
@@ -1,26 +1,8 @@
-# $NetBSD: bsd.gcc.mk,v 1.11 2015/06/07 15:04:28 matt Exp $
+# $NetBSD: bsd.gcc.mk,v 1.12 2018/05/09 13:18:53 joerg Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
-.if defined(EXTERNAL_TOOLCHAIN)
-_GCC_CRTBEGIN!= ${CC} --print-file-name=crtbegin.o
-.ifndef _GCC_CRTBEGINS
-_GCC_CRTBEGINS!= ${CC} --print-file-name=crtbeginS.o
-.endif
-_GCC_CRTEND!= ${CC} --print-file-name=crtend.o
-.ifndef _GCC_CRTENDS
-_GCC_CRTENDS!= ${CC} --print-file-name=crtendS.o
-.endif
-.ifndef _GCC_CRTI
-_GCC_CRTI!= ${CC} --print-file-name=crti.o
-.endif
-.ifndef _GCC_CRTN
-_GCC_CRTN!= ${CC} --print-file-name=crtn.o
-.endif
-_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
-_GCC_LIBGCCDIR!= dirname `${CC} --print-libgcc-file-name`
-.else
_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
@@ -29,6 +11,5 @@ _GCC_CRTI?= ${DESTDIR}/usr/lib/${MLIBDI
_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_)
