Module Name: src
Committed By: joerg
Date: Wed Dec 8 01:57:22 UTC 2010
Modified Files:
src/share/mk: bsd.lib.mk bsd.prog.mk bsd.x11.mk
Log Message:
Don't depend on ${CC} passing down -R to ld, use -Wl,-rpath explicitly.
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.251 -r1.252 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.92 -r1.93 src/share/mk/bsd.x11.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.309 src/share/mk/bsd.lib.mk:1.310
--- src/share/mk/bsd.lib.mk:1.309 Mon Nov 8 06:54:52 2010
+++ src/share/mk/bsd.lib.mk Wed Dec 8 01:57:22 2010
@@ -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 \
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.251 src/share/mk/bsd.prog.mk:1.252
--- src/share/mk/bsd.prog.mk:1.251 Mon Nov 8 06:54:52 2010
+++ src/share/mk/bsd.prog.mk Wed Dec 8 01:57:22 2010
@@ -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} \
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.92 src/share/mk/bsd.x11.mk:1.93
--- src/share/mk/bsd.x11.mk:1.92 Tue Nov 23 09:49:30 2010
+++ src/share/mk/bsd.x11.mk Wed Dec 8 01:57:22 2010
@@ -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}
