Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk Don't depend on ${CC} passing down -R to ld, use -W...
details: https://anonhg.NetBSD.org/src/rev/e1795ecb8e34
branches: trunk
changeset: 759392:e1795ecb8e34
user: joerg <joerg%NetBSD.org@localhost>
date: Wed Dec 08 01:57:22 2010 +0000
description:
Don't depend on ${CC} passing down -R to ld, use -Wl,-rpath explicitly.
diffstat:
share/mk/bsd.lib.mk | 4 ++--
share/mk/bsd.prog.mk | 4 ++--
share/mk/bsd.x11.mk | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diffs (63 lines):
diff -r b580740ee769 -r e1795ecb8e34 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk Wed Dec 08 01:55:12 2010 +0000
+++ b/share/mk/bsd.lib.mk Wed Dec 08 01:57:22 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.309 2010/11/08 06:54:52 lukem Exp $
+# $NetBSD: bsd.lib.mk,v 1.310 2010/12/08 01:57:22 joerg Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -522,7 +522,7 @@
_LIBLDOPTS=
.if ${SHLIBDIR} != "/usr/lib"
_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib \
- -R${SHLIBDIR} \
+ -Wl,-rpath,${SHLIBDIR} \
-L${DESTDIR}${SHLIBDIR}
.elif ${SHLIBINSTALLDIR} != "/usr/lib"
_LIBLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR}:${DESTDIR}/usr/lib \
diff -r b580740ee769 -r e1795ecb8e34 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk Wed Dec 08 01:55:12 2010 +0000
+++ b/share/mk/bsd.prog.mk Wed Dec 08 01:57:22 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.251 2010/11/08 06:54:52 lukem Exp $
+# $NetBSD: bsd.prog.mk,v 1.252 2010/12/08 01:57:22 joerg Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -165,7 +165,7 @@
.endif
.if ${SHLIBDIR} != "/usr/lib"
_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBDIR} \
- -R${SHLIBDIR} \
+ -Wl,-rpath,${SHLIBDIR} \
-L${DESTDIR}${SHLIBDIR}
.elif ${SHLIBINSTALLDIR} != "/usr/lib"
_PROGLDOPTS+= -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
diff -r b580740ee769 -r e1795ecb8e34 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk Wed Dec 08 01:55:12 2010 +0000
+++ b/share/mk/bsd.x11.mk Wed Dec 08 01:57:22 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.92 2010/11/23 09:49:30 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.93 2010/12/08 01:57:22 joerg Exp $
.include <bsd.init.mk>
@@ -173,7 +173,7 @@
.endif
LDFLAGS+= -Wl,-rpath-link,${DESTDIR}${X11USRLIBDIR} \
- -R${X11USRLIBDIR} \
+ -Wl,-rpath,${X11USRLIBDIR} \
-L${DESTDIR}${X11USRLIBDIR}
@@ -335,7 +335,7 @@
s,@abi_font@,0.6,; \
s,@fchown_define@,-DHAS_FCHOWN,; \
s,@sticky_bit_define@,-DHAS_STICKY_DIR_BIT," \
- -e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-R\1 &%g' \
+ -e '/^Libs:/ s%-L\([^ ]*\)%-Wl,-rpath,\1 &%g' \
< ${.IMPSRC} > ${.TARGET}.tmp && \
mv -f ${.TARGET}.tmp ${.TARGET}
Home |
Main Index |
Thread Index |
Old Index