diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-28 13:01:29 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-28 13:01:29 +0100 |
| commit | edb669940bf2dcaf4c2809fada411606ab26701a (patch) | |
| tree | 13f2f772f28bb76fa5b23deb3521c57db9ce4ca9 | |
| parent | d51623c99fb41c8113d4a9ead918d256d2764fc0 (diff) | |
| parent | e31c14ad95893d89c90f95dfe87f57f7f1b40af7 (diff) | |
| download | binutils-redhat-edb669940bf2dcaf4c2809fada411606ab26701a.tar.gz | |
Merge branch 'baserock/richardmaw/inspect-zlib' into baserock/build-essential
Briefly reviewed by Daniel Silverstone.
| -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 60b11223c6..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 --with-system-zlib\"\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 85efd878a1..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 --with-system-zlib" + --target=$TARGET_STAGE1 build-commands: # Nested configure scripts require that we set CPPFLAGS here as well |