From 40d62177cbce2b54dc1520b7d51d73db076b91c2 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 30 Jan 2012 12:19:49 +0100 Subject: [PATCH] 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). --- gnu/usr.bin/binutils221/ld/Makefile.i386 | 2 +- gnu/usr.bin/binutils221/ld/Makefile.x86_64 | 2 +- gnu/usr.bin/binutils222/ld/Makefile.i386 | 2 +- gnu/usr.bin/binutils222/ld/Makefile.x86_64 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/usr.bin/binutils221/ld/Makefile.i386 b/gnu/usr.bin/binutils221/ld/Makefile.i386 index bcedec1c26..9b0490e499 100644 --- 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 730a0400d3..8e1f794531 100644 --- 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 b960d051f0..041f13fa66 100644 --- 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 9cf6b2b614..b774d84b18 100644 --- 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} \ -- 2.41.0