binutils/ld: Don't add /usr/lib to the library search path twice.

The various toolchains we build during buildworld need different
search paths for various stages. The ${USRDATA_PREFIX} variable,
which has different values depending on the stage, is used as a
prefix so that the compilers we use to build our world can search
their includes and libraries in /usr/obj. For the compiler that
ultimately gets installed upon installworld, the prefix is empty.

In ld's Makefile, the correct path prefixed with ${USRDATA_PREFIX}
is already added to the default path a few lines above, so all is
good. This commit removes the extra /usr/lib that was unconditionally
added after the prefixed one (which is wrong).

diff --git a/gnu/usr.bin/binutils221/ld/Makefile.i386 b/gnu/usr.bin/binutils221/ld/Makefile.i386
index bcedec1..9b0490e 100644 (file)
--- a/gnu/usr.bin/binutils221/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils221/ld/Makefile.i386
@@ -29,7 +29,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \
                ${TARGET_TUPLE:Q} \
                ${TARGET_TUPLE:Q} \
                ${NATIVE_EMULATION:Q} \
-               "/usr/lib" \
+               "" \
                no \
                ${NATIVE_EMULATION:Q} \
                ${TARGET_TUPLE:Q}

diff --git a/gnu/usr.bin/binutils221/ld/Makefile.x86_64 b/gnu/usr.bin/binutils221/ld/Makefile.x86_64
index 730a040..8e1f794 100644 (file)
--- a/gnu/usr.bin/binutils221/ld/Makefile.x86_64
+++ b/gnu/usr.bin/binutils221/ld/Makefile.x86_64
@@ -25,7 +25,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \
                ${TARGET_TUPLE:Q} \
                ${TARGET_TUPLE:Q} \
                ${NATIVE_EMULATION:Q} \
-               "/usr/lib" \
+               "" \
                no \
                ${NATIVE_EMULATION:Q} \
                ${TARGET_TUPLE:Q}

diff --git a/gnu/usr.bin/binutils222/ld/Makefile.i386 b/gnu/usr.bin/binutils222/ld/Makefile.i386
index b960d05..041f13f 100644 (file)
--- a/gnu/usr.bin/binutils222/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils222/ld/Makefile.i386
@@ -29,7 +29,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \
                ${TARGET_TUPLE:Q} \
                ${TARGET_TUPLE:Q} \
                ${NATIVE_EMULATION:Q} \
-               "/usr/lib" \
+               "" \
                no \
                no \
                ${NATIVE_EMULATION:Q} \

diff --git a/gnu/usr.bin/binutils222/ld/Makefile.x86_64 b/gnu/usr.bin/binutils222/ld/Makefile.x86_64
index 9cf6b2b..b774d84 100644 (file)
--- a/gnu/usr.bin/binutils222/ld/Makefile.x86_64
+++ b/gnu/usr.bin/binutils222/ld/Makefile.x86_64
@@ -25,7 +25,7 @@ e${NATIVE_EMULATION}.c ${LDSCRIPTS_${NATIVE_EMULATION}}: \
                ${TARGET_TUPLE:Q} \
                ${TARGET_TUPLE:Q} \
                ${NATIVE_EMULATION:Q} \
-               "/usr/lib" \
+               "" \
                no \
                no \
                ${NATIVE_EMULATION:Q} \