Module Name: src Committed By: joerg Date: Mon Apr 11 23:03:38 UTC 2011
Modified Files: src/share/mk: bsd.lib.mk bsd.prog.mk bsd.x11.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.313 -r1.314 src/share/mk/bsd.lib.mk cvs rdiff -u -r1.263 -r1.264 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.96 -r1.97 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.313 src/share/mk/bsd.lib.mk:1.314 --- src/share/mk/bsd.lib.mk:1.313 Sun Apr 10 16:52:36 2011 +++ src/share/mk/bsd.lib.mk Mon Apr 11 23:03:38 2011 @@ -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 Index: src/share/mk/bsd.prog.mk diff -u src/share/mk/bsd.prog.mk:1.263 src/share/mk/bsd.prog.mk:1.264 --- src/share/mk/bsd.prog.mk:1.263 Sun Apr 10 16:52:36 2011 +++ src/share/mk/bsd.prog.mk Mon Apr 11 23:03:38 2011 @@ -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 Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.96 src/share/mk/bsd.x11.mk:1.97 --- src/share/mk/bsd.x11.mk:1.96 Mon Apr 11 21:04:11 2011 +++ src/share/mk/bsd.x11.mk Mon Apr 11 23:03:38 2011 @@ -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} #