Module Name:    src
Committed By:   christos
Date:           Thu Jul 19 19:42:45 UTC 2012

Modified Files:
        src/share/mk: bsd.gcc.mk bsd.lib.mk

Log Message:
>From pooka: Fix EXTERNAL_TOOLCHAIN compilation where crti/crtn are not in the
same directory as crtbegin


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/mk/bsd.gcc.mk
cvs rdiff -u -r1.321 -r1.322 src/share/mk/bsd.lib.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.3 src/share/mk/bsd.gcc.mk:1.4
--- src/share/mk/bsd.gcc.mk:1.3	Sat Oct 25 15:11:28 2008
+++ src/share/mk/bsd.gcc.mk	Thu Jul 19 15:42:45 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.gcc.mk,v 1.3 2008/10/25 19:11:28 mrg Exp $
+#	$NetBSD: bsd.gcc.mk,v 1.4 2012/07/19 19:42:45 christos Exp $
 
 .if !defined(_BSD_GCC_MK_)
 _BSD_GCC_MK_=1
@@ -8,6 +8,8 @@ _GCC_CRTBEGIN!=		${CC} --print-file-name
 _GCC_CRTBEGINS!=	${CC} --print-file-name=crtbeginS.o
 _GCC_CRTEND!=		${CC} --print-file-name=crtend.o
 _GCC_CRTENDS!=		${CC} --print-file-name=crtendS.o
+_GCC_CRTI!=		${CC} --print-file-name=crti.o
+_GCC_CRTN!=		${CC} --print-file-name=crtn.o
 _GCC_CRTDIR!=		dirname ${_GCC_CRTBEGIN}
 _GCC_LIBGCCDIR!=	dirname `${CC} --print-libgcc-file-name`
 .else
@@ -15,6 +17,8 @@ _GCC_CRTBEGIN?=		${DESTDIR}/usr/lib/crtb
 _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
 .endif

Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.321 src/share/mk/bsd.lib.mk:1.322
--- src/share/mk/bsd.lib.mk:1.321	Sun Feb 19 18:19:37 2012
+++ src/share/mk/bsd.lib.mk	Thu Jul 19 15:42:45 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.321 2012/02/19 23:19:37 matt Exp $
+#	$NetBSD: bsd.lib.mk,v 1.322 2012/07/19 19:42:45 christos Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -193,8 +193,8 @@ MKSHLIBOBJS= no
 SHLIB_SOVERSION=	${SHLIB_MAJOR}
 SHLIB_SHFLAGS=		-Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION}
 SHLIB_SHFLAGS+=		-Wl,--warn-shared-textrel
-SHLIB_LDSTARTFILE?=	${_GCC_CRTDIR}/crti.o ${_GCC_CRTBEGINS}
-SHLIB_LDENDFILE?=	${_GCC_CRTENDS} ${_GCC_CRTDIR}/crtn.o
+SHLIB_LDSTARTFILE?=	${_GCC_CRTI} ${_GCC_CRTBEGINS}
+SHLIB_LDENDFILE?=	${_GCC_CRTENDS} ${_GCC_CRTN}
 
 CFLAGS+=	${COPTS}
 OBJCFLAGS+=	${OBJCOPTS}

Reply via email to