build_cross_tools_gcc4: unbreak --use-gcc-graphite.

* added -pipe to CFLAGS, builds are faster and /tmp usage is avoided at the
cost of more memory used.
* replaced ppl by isl as required by gcc 4.8
This commit is contained in:
Jérôme Duval 2014-01-28 17:50:01 +01:00
parent 35d6e0fe81
commit 1e93288e65
2 changed files with 20 additions and 19 deletions

View File

@ -112,16 +112,16 @@ mkdir -p "$installDir/lib/gcc/$haikuMachine/$gccVersion"
if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
cloogSourceDir="$buildToolsDir/cloog"
gmpSourceDir="$buildToolsDir/gcc/gmp"
pplSourceDir="$buildToolsDir/ppl"
islSourceDir="$buildToolsDir/isl"
pplObjDir="$objDir/ppl"
islObjDir="$objDir/isl"
gmpObjDir="$objDir/gmp"
cloogObjDir="$objDir/cloog"
mkdir -p "$pplObjDir" "$gmpObjDir" "$cloogObjDir" || exit 1
mkdir -p "$islObjDir" "$gmpObjDir" "$cloogObjDir" || exit 1
gccConfigureArgs="$gccConfigureArgs --with-cloog=\"$installDir\" \
--enable-cloog-backend=isl --with-ppl=\"$installDir\" \
--disable-cloog-version-check --with-gmp=\"$installDir\" \
gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
--enable-cloog-backend=isl --with-isl=$installDir \
--with-gmp=$installDir \
--with-host-libstdcxx=\"-lstdc++\""
fi
@ -134,7 +134,7 @@ export LC_ALL=POSIX
# build binutils
cd "$binutilsObjDir"
CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsSourceDir/configure" \
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$binutilsSourceDir/configure" \
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
--enable-targets=$haikuMachine,i386-efi-pe,x86_64-efi-pe \
--disable-nls --disable-shared --disable-werror \
@ -154,21 +154,20 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
$MAKE $additionalMakeArgs || exit 1
$MAKE $additionalMakeArgs install || exit 1
# build ppl
cd "$pplObjDir"
CFLAGS="-O2" CXXFLAGS="-O2" "$pplSourceDir/configure" --prefix="$installDir" \
--disable-nls --disable-shared --disable-watchdog \
--disable-maintainer-mode || exit 1
$MAKE $additionalMakeArgs AUTOCONF:=true AUTOHEADER:=true ACLOCAL:=true \
AUTOMAKE:=true || exit 1
$MAKE $additionalMakeArgs install AUTOCONF:=true AUTOHEADER:=true \
ACLOCAL:=true AUTOMAKE:=true || exit 1
# build isl
cd "$islObjDir"
CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" "$islSourceDir/configure" \
--prefix="$installDir" --disable-nls --disable-shared \
--with-gmp-prefix="$installDir" || exit 1
$MAKE $additionalMakeArgs || exit 1
$MAKE $additionalMakeArgs install || exit 1
# build cloog
cd "$cloogObjDir"
CFLAGS="-O2" CXXFLAGS="-O2" "$cloogSourceDir/configure" \
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$cloogSourceDir/configure" \
--prefix="$installDir" --disable-nls --disable-shared \
--with-gmp-prefix="$installDir" || exit 1
--with-gmp-prefix="$installDir" --with-isl-prefix=="$installDir" \
|| exit 1
$MAKE $additionalMakeArgs || exit 1
$MAKE $additionalMakeArgs install || exit 1
fi
@ -196,7 +195,7 @@ copy_headers "$haikuSourceDir/headers/posix" "$tmpIncludeDir/posix"
# configure gcc
cd "$gccObjDir"
CFLAGS="-O2" CXXFLAGS="-O2" "$gccSourceDir/configure" \
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$gccSourceDir/configure" \
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
--disable-nls --disable-shared --with-system-zlib \
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \

2
configure vendored
View File

@ -770,6 +770,8 @@ else
if [ $targetArch != x86_gcc2 ]; then
script="${script}_gcc4"
scriptArgs="$targetMachine"
set_default_value HAIKU_USE_GCC_GRAPHITE_$targetArch \
$useGccGraphiteDefault
fi
secondaryArch=
if [ -z "$isPrimaryArch" ]; then