diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-23 17:58:09 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-23 17:58:09 +0000 |
| commit | de73dd20fa224541f58eae4f7de78b8b1347ab0c (patch) | |
| tree | d6816fa00af89607628fe9f715dd4ecf224f82e9 | |
| parent | a0119064a3098ec69ab75359d50d4048ebff187d (diff) | |
| download | gcc-tarball-baserock/richardmaw/inspect-zlib.tar.gz | |
morphology: use embedded zlibbaserock/richardmaw/inspect-zlib
Enough can go wrong that we don't want to require shared objects
working. For example, with a shared object built by a bootstrap
compiler, it can include symbols it shouldn't in the shared object.
This causes problems later when it tries to use working shared objects.
| -rw-r--r-- | stage2-gcc.morph | 2 | ||||
| -rw-r--r-- | stage2-gcc.morph.yaml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/stage2-gcc.morph b/stage2-gcc.morph index 6e50dad8d7..ed009dbdcd 100644 --- a/stage2-gcc.morph +++ b/stage2-gcc.morph @@ -5,7 +5,7 @@ "stage2-eglibc-fix-specs", "cat \"gcc/limitx.h\" \"gcc/glimits.h\" \"gcc/limity.h\" > limits.h.tmp\nlibgcc_dir=$(dirname $($TARGET_STAGE1-gcc -print-libgcc-file-name))\ncp limits.h.tmp \"$libgcc_dir/include-fixed/limits.h\"\n", "mkdir o", - "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\ncd o && ../configure \\\n $(../morph-arch-config) \\\n `# [1]` --build=$(sh ../config.guess) \\\n --host=$TARGET_STAGE1 \\\n --target=$TARGET_STAGE1 \\\n --prefix=\"$PREFIX\" \\\n `# [2]` --with-local-prefix=$PREFIX \\\n `# [3]` --with-build-sysroot=\"$STAGE2_SYSROOT\" \\\n --disable-bootstrap \\\n --enable-clocale=gnu --enable-shared --enable-threads=posix \\\n `# [4]` --enable-languages=c \\\n `# [5]` --libdir=$PREFIX/lib \\\n --disable-libgomp --disable-multilib --disable-nls \\\n --without-cloog --without-ppl \\\n --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\" \\\n --with-system-zlib\n" + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CC=\"$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT\"\nexport LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\"\ncd o && ../configure \\\n $(../morph-arch-config) \\\n `# [1]` --build=$(sh ../config.guess) \\\n --host=$TARGET_STAGE1 \\\n --target=$TARGET_STAGE1 \\\n --prefix=\"$PREFIX\" \\\n `# [2]` --with-local-prefix=$PREFIX \\\n `# [3]` --with-build-sysroot=\"$STAGE2_SYSROOT\" \\\n --disable-bootstrap \\\n --enable-clocale=gnu --enable-shared --enable-threads=posix \\\n `# [4]` --enable-languages=c \\\n `# [5]` --libdir=$PREFIX/lib \\\n --disable-libgomp --disable-multilib --disable-nls \\\n --without-cloog --without-ppl \\\n --with-mpfr-include=\"$(pwd)/../mpfr/src\" \\\n --with-mpfr-lib=\"$(pwd)/mpfr/src/.libs\"\n" ], "build-commands": [ "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\ncd o && make\n" diff --git a/stage2-gcc.morph.yaml b/stage2-gcc.morph.yaml index 07f9dd7d1e..b747cf9182 100644 --- a/stage2-gcc.morph.yaml +++ b/stage2-gcc.morph.yaml @@ -55,8 +55,7 @@ configure-commands: --disable-libgomp --disable-multilib --disable-nls \ --without-cloog --without-ppl \ --with-mpfr-include="$(pwd)/../mpfr/src" \ - --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \ - --with-system-zlib + --with-mpfr-lib="$(pwd)/mpfr/src/.libs" build-commands: - | |