Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk replace /usr/lib with ${_GCC_CRTDIR} or ${SHLIBDIR}...
details: https://anonhg.NetBSD.org/src/rev/17e7627e2140
branches: trunk
changeset: 749918:17e7627e2140
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Dec 12 21:33:50 2009 +0000
description:
replace /usr/lib with ${_GCC_CRTDIR} or ${SHLIBDIR} as appropriate.
diffstat:
share/mk/bsd.lib.mk | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (29 lines):
diff -r fd01c0c24814 -r 17e7627e2140 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk Sat Dec 12 21:28:04 2009 +0000
+++ b/share/mk/bsd.lib.mk Sat Dec 12 21:33:50 2009 +0000
@@ -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}} \
Home |
Main Index |
Thread Index |
Old Index