From 020f62cdf298ac0853c37cefceee6f5fa0043105 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Thu, 23 May 2013 17:55:42 +0000
Subject: morphology: use embedded zlib during stage 2

Enough things can go wrong that we can't rely on having shared objects
work during this stage of the bootstrap, hence why the toolchain
will use embedded zlib.

This also fixes a typo with `--with-lib-path`, so it shouldn't use
the host's libraries any more.
---
 stage2-binutils.morph      | 2 +-
 stage2-binutils.morph.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stage2-binutils.morph b/stage2-binutils.morph
index 60b11223c6..4b664a0756 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  --with-lib-path=\"$PREFIX/lib\"\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..a1f2d92e64 100644
--- a/stage2-binutils.morph.yaml
+++ b/stage2-binutils.morph.yaml
@@ -14,7 +14,7 @@ configure-commands:
         --build=$(sh config.guess) \
         --host=$TARGET_STAGE1 \
         --target=$TARGET_STAGE1 \
-        --with-lib-path="$PREFIX/lib --with-system-zlib"
+        --with-lib-path="$PREFIX/lib"
 
 build-commands:
     # Nested configure scripts require that we set CPPFLAGS here as well
-- 
cgit v1.2.1