Module Name: src
Committed By: mrg
Date: Sat Dec 12 21:33:51 UTC 2009
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
replace /usr/lib with ${_GCC_CRTDIR} or ${SHLIBDIR} as appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.300 src/share/mk/bsd.lib.mk:1.301
--- src/share/mk/bsd.lib.mk:1.300 Tue Dec 8 15:18:42 2009
+++ src/share/mk/bsd.lib.mk Sat Dec 12 21:33:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.300 2009/12/08 15:18:42 uebayasi Exp $
+# $NetBSD: bsd.lib.mk,v 1.301 2009/12/12 21:33:50 mrg Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -205,8 +205,8 @@
SHLIB_SOVERSION= ${SHLIB_MAJOR}
SHLIB_SHFLAGS= -Wl,-soname,${_LIB_PREFIX}${LIB}.so.${SHLIB_SOVERSION}
SHLIB_SHFLAGS+= -Wl,--warn-shared-textrel
-SHLIB_LDSTARTFILE?= ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGINS}
-SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${DESTDIR}/usr/lib/crtn.o
+SHLIB_LDSTARTFILE?= ${_GCC_CRTDIR}/crti.o ${_GCC_CRTBEGINS}
+SHLIB_LDENDFILE?= ${_GCC_CRTENDS} ${_GCC_CRTDIR}/crtn.o
.endif
CFLAGS+= ${COPTS}
@@ -523,7 +523,7 @@
${_MKTARGET_BUILD}
rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
.if defined(DESTDIR)
- ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
+ ${LIBCC} ${LDLIBC} -Wl,-nostdlib -B${_GCC_CRTDIR}/ -B${DESTDIR}${SHLIBDIR}/ \
-Wl,-x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
-Wl,--whole-archive ${SOLIB} \
-Wl,--no-whole-archive ${_LDADD.lib${LIB}} \
