[src/trunk]: src/share/mk Adjust --sysroot related usage:

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d5710f483439
branches:  trunk
changeset: 764126:d5710f483439
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Apr 11 23:03:38 2011 +0000

description:
Adjust --sysroot related usage:
-Wl,-rpath does not expand =, so just drop it.

Drop -Wl,-rpath-link entries that duplicate the -Wl,-rpath entries, this
is done implicitly now that ld is built with sysroot support.

Use ${DESTDIR} explicitly for the remaining -Wl,-rpath-link entries.

diffstat:

 share/mk/bsd.lib.mk  |  7 +++----
 share/mk/bsd.prog.mk |  7 +++----
 share/mk/bsd.x11.mk  |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diffs (64 lines):

diff -r 8e0ab40eeec5 -r d5710f483439 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Mon Apr 11 22:47:50 2011 +0000
+++ b/share/mk/bsd.lib.mk       Mon Apr 11 23:03:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.313 2011/04/10 16:52:36 joerg Exp $
+#      $NetBSD: bsd.lib.mk,v 1.314 2011/04/11 23:03:38 joerg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -511,11 +511,10 @@
 
 _LIBLDOPTS=
 .if ${SHLIBDIR} != "/usr/lib"
-_LIBLDOPTS+=   -Wl,-rpath-link,=${SHLIBDIR} \
-               -Wl,-rpath,=${SHLIBDIR} \
+_LIBLDOPTS+=   -Wl,-rpath,${SHLIBDIR} \
                -L=${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"
-_LIBLDOPTS+=   -Wl,-rpath-link,=${SHLIBINSTALLDIR} \
+_LIBLDOPTS+=   -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
                -L=${SHLIBINSTALLDIR}
 .endif
 
diff -r 8e0ab40eeec5 -r d5710f483439 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Mon Apr 11 22:47:50 2011 +0000
+++ b/share/mk/bsd.prog.mk      Mon Apr 11 23:03:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.263 2011/04/10 16:52:36 joerg Exp $
+#      $NetBSD: bsd.prog.mk,v 1.264 2011/04/11 23:03:38 joerg Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -162,11 +162,10 @@
 _PROGLDOPTS+=  -Wl,-dynamic-linker=${_SHLINKER}
 .endif
 .if ${SHLIBDIR} != "/usr/lib"
-_PROGLDOPTS+=  -Wl,-rpath-link,=${SHLIBDIR} \
-               -Wl,-rpath,=${SHLIBDIR} \
+_PROGLDOPTS+=  -Wl,-rpath,${SHLIBDIR} \
                -L=${SHLIBDIR}
 .elif ${SHLIBINSTALLDIR} != "/usr/lib"
-_PROGLDOPTS+=  -Wl,-rpath-link,=${SHLIBINSTALLDIR} \
+_PROGLDOPTS+=  -Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
                -L=${SHLIBINSTALLDIR}
 .endif
 
diff -r 8e0ab40eeec5 -r d5710f483439 share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk       Mon Apr 11 22:47:50 2011 +0000
+++ b/share/mk/bsd.x11.mk       Mon Apr 11 23:03:38 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.x11.mk,v 1.96 2011/04/11 21:04:11 joerg Exp $
+#      $NetBSD: bsd.x11.mk,v 1.97 2011/04/11 23:03:38 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -172,7 +172,7 @@
 CPPFLAGS+=             -D__AMD64__
 .endif
 
-LDFLAGS+=              -Wl,-rpath,=${X11USRLIBDIR} -L=${X11USRLIBDIR}
+LDFLAGS+=              -Wl,-rpath,${X11USRLIBDIR} -L=${X11USRLIBDIR}
 
 
 #