Stage 3 of dynamic root support, con't.

'ld' should also search /lib for dynamic libraries.

6 files changed, 6 insertions, 6 deletions

diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 01d1429..d15f96d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -7,7 +7,7 @@ NATIVE_EMULATION=	elf64alpha_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_alpha_path=	\"${TOOLS_PREFIX}/usr/lib\"
+_alpha_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
 .else
 _alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.amd64 b/gnu/usr.bin/binutils/ld/Makefile.amd64
index 2555374..3e63a8f 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.amd64
+++ b/gnu/usr.bin/binutils/ld/Makefile.amd64
@@ -6,7 +6,7 @@ NATIVE_EMULATION=	elf_x86_64_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_amd64_path=	\"${TOOLS_PREFIX}/usr/lib\"
+_amd64_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
 EMS+=		${NATIVE_EMULATION}
 LDSCRIPTS+=	${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \
 		${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index f03ecd3..b959aaf 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -7,7 +7,7 @@ NATIVE_EMULATION=	elf_i386_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_i386_path=	\"${TOOLS_PREFIX}/usr/lib\"
+_i386_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
 .else
 _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.ia64 b/gnu/usr.bin/binutils/ld/Makefile.ia64
index f9ede04..d5d3d1c 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.ia64
+++ b/gnu/usr.bin/binutils/ld/Makefile.ia64
@@ -7,7 +7,7 @@ NATIVE_EMULATION=	elf64_ia64_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_ia64_path=	\"${TOOLS_PREFIX}/usr/lib\"
+_ia64_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
 .else
 _ia64_path=	\"/usr/cross/ia64-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index c5e0977..ee5a258 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -7,7 +7,7 @@ NATIVE_EMULATION=	elf32ppc
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_powerpc_path=	\"${TOOLS_PREFIX}/usr/lib\"
+_powerpc_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
 .else
 _powerpc_path=	\"/usr/cross/powerpc-freebsd/usr/lib\"
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index 2b5f711..9b7f7fd 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -7,7 +7,7 @@ NATIVE_EMULATION=	elf64_sparc_fbsd
 HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
-_sparc_path=	\"${TOOLS_PREFIX}/usr/lib\"
+_sparc_path=	\"${TOOLS_PREFIX}/lib:${TOOLS_PREFIX}/usr/lib\"
 .else
 _sparc_path=	\"/usr/cross/sparc-freebsd/usr/lib\"
 .endif