diff options
| author | Nico Huber <nico.h@gmx.de> | 2016-01-31 23:05:19 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2016-05-04 13:39:14 +0200 |
| commit | 5f72f960dfd13d2a7ade670650c54be48fb2b017 (patch) | |
| tree | 778a86fc49041e4077d5600182fa9893d519f19d /util/crossgcc | |
| parent | bc2d151b004663ed3605286661bd6e4203001f86 (diff) | |
| download | coreboot-5f72f960dfd13d2a7ade670650c54be48fb2b017.tar.xz | |
buildgcc: Always set HOSTCFLAGS
Always set HOSTCFLAGS to the flags GMP was built with, defaulting to
"-Os" if it isn't built yet. Previously, if GMP was already built or
not even in the list of packages to be built, this was silently skipped
and other packages were built with empty HOSTCFLAGS.
Change-Id: I29b2ea75283410a6cea60dc1c92b87573aebfb34
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/13550
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util/crossgcc')
| -rwxr-xr-x | util/crossgcc/buildgcc | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 57eb5125a4..3cee8f6a81 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -404,18 +404,28 @@ GNU General Public License for more details. EOF } +have_hostcflags_from_gmp() { + grep -q __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h >/dev/null 2>&1 +} + +set_hostcflags_from_gmp() { + # Now set CFLAGS to match GMP CFLAGS but strip out -pedantic + # as GCC 4.6.x fails if it's there. + export HOSTCFLAGS=$(grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2 |\ + sed s,-pedantic,,) +} + build_GMP() { - CC="$CC" CFLAGS="-Os" ../${GMP_DIR}/configure --disable-shared --enable-fat --prefix=$TARGETDIR $OPTIONS \ + CC="$CC" CFLAGS="$HOSTCFLAGS" \ + ../${GMP_DIR}/configure --disable-shared --enable-fat \ + --prefix=$TARGETDIR $OPTIONS \ || touch .failed $MAKE $JOBS || touch .failed $MAKE install DESTDIR=$DESTDIR || touch .failed normalize_dirs - # Now set CFLAGS to match GMP CFLAGS but strip out -pedantic - # as GCC 4.6.x fails if it's there. - export HOSTCFLAGS=$(grep __GMP_CFLAGS $DESTDIR$TARGETDIR/include/gmp.h |cut -d\" -f2 |\ - sed s,-pedantic,,) + set_hostcflags_from_gmp } build_MPFR() { @@ -778,6 +788,11 @@ elif [ $UNAME = "NetBSD" ]; then fi fi # GCC +export HOSTCFLAGS="-Os" +if have_hostcflags_from_gmp; then + set_hostcflags_from_gmp +fi + if [ "$USECCACHE" = 1 ]; then CC="ccache $CC" fi |