diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-24 10:55:11 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-24 13:50:32 +0000 |
| commit | e31c14ad95893d89c90f95dfe87f57f7f1b40af7 (patch) | |
| tree | 13f2f772f28bb76fa5b23deb3521c57db9ce4ca9 | |
| parent | 020f62cdf298ac0853c37cefceee6f5fa0043105 (diff) | |
| download | binutils-redhat-baserock/richardmaw/inspect-zlib.tar.gz | |
morphology: remove --with-lib-pathbaserock/richardmaw/inspect-zlib
This is needed for it to look in /usr/lib. This is needed
for gcc later, which needs to link against the system zlib, which
is installed in /usr/lib. Without it, it will not find it because
it only looks in *lib64 and /tools.
It used to coincidentally work before, since the stage 2 artifacts were
similar enough. This similarity broke building on ARM after shared
objects for zlib were introduced, since the stage 2 shared objects
were warped, and incompatible with correctly built shared objects.
| -rw-r--r-- | stage2-binutils.morph | 2 | ||||
| -rw-r--r-- | stage2-binutils.morph.yaml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/stage2-binutils.morph b/stage2-binutils.morph index 4b664a0756..21b8e1ebb4 100644 --- a/stage2-binutils.morph +++ b/stage2-binutils.morph @@ -4,7 +4,7 @@ "build-system": "autotools", "configure-commands": [ "stage2-eglibc-fix-specs", - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CXX=false\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --build=$(sh config.guess) \\\n --host=$TARGET_STAGE1 \\\n --target=$TARGET_STAGE1 \\\n --with-lib-path=\"$PREFIX/lib\"\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CXX=false\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\" --disable-nls --disable-werror \\\n --build=$(sh config.guess) \\\n --host=$TARGET_STAGE1 \\\n --target=$TARGET_STAGE1\n" ], "build-commands": [ "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\nmake\n" diff --git a/stage2-binutils.morph.yaml b/stage2-binutils.morph.yaml index a1f2d92e64..b45cca4522 100644 --- a/stage2-binutils.morph.yaml +++ b/stage2-binutils.morph.yaml @@ -13,8 +13,7 @@ configure-commands: ./configure --prefix="$PREFIX" --disable-nls --disable-werror \ --build=$(sh config.guess) \ --host=$TARGET_STAGE1 \ - --target=$TARGET_STAGE1 \ - --with-lib-path="$PREFIX/lib" + --target=$TARGET_STAGE1 build-commands: # Nested configure scripts require that we set CPPFLAGS here as well |