Browse Source

gcc: fixed cross build by explicitely setting the path to find build prerequisites only at toolchain stage

Note:

This reverts the changes done by following commit:
-----------------------------------------------------------------------------
commit 041df7170f
Author:     Christian Wiese <[email protected]>
AuthorDate: Mon Aug 6 23:56:15 2012 +0200
Commit:     Christian Wiese <[email protected]>
CommitDate: Tue Oct 23 00:25:40 2012 +0200

    gcc: changed to set locations of build prerequisites in all stages instead of toolchain stage only
-----------------------------------------------------------------------------

which badly broke the cross-build of gcc when using uclibc!
user/karasz/firmware
Christian Wiese 13 years ago
parent
commit
dd037c390d
  1. 36
      base/gcc/gcc.conf

36
base/gcc/gcc.conf

@ -136,7 +136,20 @@ if [ "$SDECFG_LIBC" = 'glibc' ]; then
fi
# build prerequisites
if atstage toolchain; then
bindir="/$prefix/crosscc"
var_append confopt " " "--with-sysroot=$sysroot"
var_append confopt " " "--program-prefix=${arch_target}-"
var_append confopt " " "--disable-cpp"
var_append confopt " " "--disable-shared"
var_append confopt " " "--disable-libssp"
var_append confopt " " "--disable-libgomp"
var_append confopt " " "--disable-libquadmath"
var_append confopt " " "--disable-libitm"
# use the native libraries we build in the toolchain directory
var_append extraconfopt ' ' "--with-gmp=$( pkgprefix -r gmp )"
var_append extraconfopt ' ' "--with-gmp-lib=$( pkgprefix -r libdir gmp )"
var_append extraconfopt ' ' "--with-gmp-include=$( pkgprefix -r includedir gmp )"
@ -147,6 +160,10 @@ var_append extraconfopt ' ' "--with-mpc=$( pkgprefix -r libmpc )"
var_append extraconfopt ' ' "--with-mpc-lib=$( pkgprefix -r libdir libmpc )"
var_append extraconfopt ' ' "--with-mpc-include=$( pkgprefix -r includedir libmpc )"
export LDFLAGS="-Wl,-rpath,${root}${libdir}"
fi
# Graphite loop optimization
if pkginstalled -f cloog && pkginstalled -f ppl; then
# use the cloog-isl backend
@ -161,23 +178,6 @@ if pkginstalled -f cloog && pkginstalled -f ppl; then
var_append extraconfopt ' ' "--with-ppl-include=$( pkgprefix -r includedir ppl )"
fi
if atstage toolchain; then
bindir="/$prefix/crosscc"
var_append confopt " " "--with-sysroot=$sysroot"
var_append confopt " " "--program-prefix=${arch_target}-"
var_append confopt " " "--disable-cpp"
var_append confopt " " "--disable-shared"
var_append confopt " " "--disable-libssp"
var_append confopt " " "--disable-libgomp"
var_append confopt " " "--disable-libquadmath"
var_append confopt " " "--disable-libitm"
# use the native libraries we build in the toolchain directory
export LDFLAGS="-Wl,-rpath,${root}${libdir}"
fi
if atstage cross; then
# for gcc versions 4.3 and upwards we have to explicitely specifiy the
# target architecture at cross-compiling stage

Loading…
Cancel
Save