diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-01-12 15:13:53 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-01-23 15:19:29 +0000 |
commit | fe5e9e45bb56bccb6c6ad755b21074ce4df26a02 (patch) | |
tree | 487090b1a60e693affaab57fe0e3eea53909481e /strata/build-essential/stage2-gcc.morph | |
parent | d022ac34d44616e7c7479a0aa1e81287786f3299 (diff) | |
download | definitions-fe5e9e45bb56bccb6c6ad755b21074ce4df26a02.tar.gz |
Update GCC to 4.9.2
Update the GCC compiler to the 4.9.2 version. It turns out that a C++
compiler is required to build the latest GCC releases, so build one in
stages 1 and 2 as well.
The updated list of GCC configuration options that either don't work in
a cross compiler or are not needed in a temporary compiler, were based
on the latest instructions from Linux From Scratch.
The inclusion of /lib64 in the lib path for the stage 1 linker is an
attempt to turn things more robust rather than to just symlink in /lib
stuff that ends up installed in /lib64 (as it is already being done for
libgcc_s.so). Ideally, we should configure every chunk to install to
/lib, however GCC seems to not honour the `--with-libdir` configuration
flag.
With this version of GCC, it looks like a sysroot needs to be given at
configure time so that `--with-native-system-header-dir` does what it
claims to do. Unfortunately, this has the side effect of making GCC not
passing to the linker the linker sysroot flag: `-Wl,--sysroot=$SYSROOT`.
The workaround is to modify LDFLAGS to give a sysroot directly to GCC,
`--sysroot=$SYSROOT`, which will then be further passed down to the
linker.
As the newest version of GCC finds more warnings than the previous one,
`-Werror` was disabled for the coreutils, GDB and Syslinux projects.
Syslinux's Makefile had to be patched, as it is not possible to disable
`-Werror` for all targets through the NO_WERROR variable.
The hack to handle libgcc_eh being required during eglibc's build was
removed, as it doesn't seem to be the case anymore.
Diffstat (limited to 'strata/build-essential/stage2-gcc.morph')
-rw-r--r-- | strata/build-essential/stage2-gcc.morph | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph index 21666c72..d48e236f 100644 --- a/strata/build-essential/stage2-gcc.morph +++ b/strata/build-essential/stage2-gcc.morph @@ -19,11 +19,12 @@ configure-commands: # 3. Disable searching /usr/local/include for headers # 4. This flag causes the correct --sysroot flag to be passed when # calling stage 1 GCC. -# 5. C++ is built in stage 3. - | export STAGE2_SYSROOT="$(dirname $(pwd))" export CC="$TARGET_STAGE1-gcc --sysroot=$STAGE2_SYSROOT" - export LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" + export CXX="$TARGET_STAGE1-g++ --sysroot=$STAGE2_SYSROOT" + export AR="$TARGET_STAGE1-ar" + export RANLIB="$TARGET_STAGE1-ranlib" cd o && ../configure \ $(../morph-arch-config) \ --build=$(sh ../config.guess) \ @@ -33,21 +34,19 @@ configure-commands: `# [2]` --libdir=$PREFIX/lib \ `# [3]` --with-local-prefix=$PREFIX \ `# [4]` --with-build-sysroot="$STAGE2_SYSROOT" \ - --with-mpfr-include="$(pwd)/../mpfr/src" \ - --with-mpfr-lib="$(pwd)/mpfr/src/.libs" \ - --without-cloog \ - --without-ppl \ --disable-bootstrap \ --disable-nls \ --disable-multilib \ --disable-libgomp \ - --enable-clocale=gnu \ - --enable-shared \ - --enable-threads=posix \ - `# [5]` --enable-languages=c + --disable-libstdcxx-pch \ + --enable-languages=c,c++ build-commands: - | + case "$MORPH_ARCH" in + armv7*) sed -i "s/--host=none/--host=armv7a/" o/Makefile + sed -i "s/--target=none/--target=armv7a/" o/Makefile ;; + esac export STAGE2_SYSROOT="$(dirname $(pwd))" cd o && make |