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:
@@ -112,16 +112,16 @@ mkdir -p "$installDir/lib/gcc/$haikuMachine/$gccVersion"
|
|||||||
if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
|
if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
|
||||||
cloogSourceDir="$buildToolsDir/cloog"
|
cloogSourceDir="$buildToolsDir/cloog"
|
||||||
gmpSourceDir="$buildToolsDir/gcc/gmp"
|
gmpSourceDir="$buildToolsDir/gcc/gmp"
|
||||||
pplSourceDir="$buildToolsDir/ppl"
|
islSourceDir="$buildToolsDir/isl"
|
||||||
|
|
||||||
pplObjDir="$objDir/ppl"
|
islObjDir="$objDir/isl"
|
||||||
gmpObjDir="$objDir/gmp"
|
gmpObjDir="$objDir/gmp"
|
||||||
cloogObjDir="$objDir/cloog"
|
cloogObjDir="$objDir/cloog"
|
||||||
mkdir -p "$pplObjDir" "$gmpObjDir" "$cloogObjDir" || exit 1
|
mkdir -p "$islObjDir" "$gmpObjDir" "$cloogObjDir" || exit 1
|
||||||
|
|
||||||
gccConfigureArgs="$gccConfigureArgs --with-cloog=\"$installDir\" \
|
gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
|
||||||
--enable-cloog-backend=isl --with-ppl=\"$installDir\" \
|
--enable-cloog-backend=isl --with-isl=$installDir \
|
||||||
--disable-cloog-version-check --with-gmp=\"$installDir\" \
|
--with-gmp=$installDir \
|
||||||
--with-host-libstdcxx=\"-lstdc++\""
|
--with-host-libstdcxx=\"-lstdc++\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@ export LC_ALL=POSIX
|
|||||||
|
|
||||||
# build binutils
|
# build binutils
|
||||||
cd "$binutilsObjDir"
|
cd "$binutilsObjDir"
|
||||||
CFLAGS="-O2" CXXFLAGS="-O2" "$binutilsSourceDir/configure" \
|
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$binutilsSourceDir/configure" \
|
||||||
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
|
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
|
||||||
--enable-targets=$haikuMachine,i386-efi-pe,x86_64-efi-pe \
|
--enable-targets=$haikuMachine,i386-efi-pe,x86_64-efi-pe \
|
||||||
--disable-nls --disable-shared --disable-werror \
|
--disable-nls --disable-shared --disable-werror \
|
||||||
@@ -154,21 +154,20 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
|
|||||||
$MAKE $additionalMakeArgs || exit 1
|
$MAKE $additionalMakeArgs || exit 1
|
||||||
$MAKE $additionalMakeArgs install || exit 1
|
$MAKE $additionalMakeArgs install || exit 1
|
||||||
|
|
||||||
# build ppl
|
# build isl
|
||||||
cd "$pplObjDir"
|
cd "$islObjDir"
|
||||||
CFLAGS="-O2" CXXFLAGS="-O2" "$pplSourceDir/configure" --prefix="$installDir" \
|
CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" "$islSourceDir/configure" \
|
||||||
--disable-nls --disable-shared --disable-watchdog \
|
--prefix="$installDir" --disable-nls --disable-shared \
|
||||||
--disable-maintainer-mode || exit 1
|
--with-gmp-prefix="$installDir" || exit 1
|
||||||
$MAKE $additionalMakeArgs AUTOCONF:=true AUTOHEADER:=true ACLOCAL:=true \
|
$MAKE $additionalMakeArgs || exit 1
|
||||||
AUTOMAKE:=true || exit 1
|
$MAKE $additionalMakeArgs install || exit 1
|
||||||
$MAKE $additionalMakeArgs install AUTOCONF:=true AUTOHEADER:=true \
|
|
||||||
ACLOCAL:=true AUTOMAKE:=true || exit 1
|
|
||||||
|
|
||||||
# build cloog
|
# build cloog
|
||||||
cd "$cloogObjDir"
|
cd "$cloogObjDir"
|
||||||
CFLAGS="-O2" CXXFLAGS="-O2" "$cloogSourceDir/configure" \
|
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$cloogSourceDir/configure" \
|
||||||
--prefix="$installDir" --disable-nls --disable-shared \
|
--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 || exit 1
|
||||||
$MAKE $additionalMakeArgs install || exit 1
|
$MAKE $additionalMakeArgs install || exit 1
|
||||||
fi
|
fi
|
||||||
@@ -196,7 +195,7 @@ copy_headers "$haikuSourceDir/headers/posix" "$tmpIncludeDir/posix"
|
|||||||
|
|
||||||
# configure gcc
|
# configure gcc
|
||||||
cd "$gccObjDir"
|
cd "$gccObjDir"
|
||||||
CFLAGS="-O2" CXXFLAGS="-O2" "$gccSourceDir/configure" \
|
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$gccSourceDir/configure" \
|
||||||
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
|
--prefix="$installDir" $buildHostSpec --target=$haikuMachine \
|
||||||
--disable-nls --disable-shared --with-system-zlib \
|
--disable-nls --disable-shared --with-system-zlib \
|
||||||
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
|
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
|
||||||
|
|||||||
@@ -770,6 +770,8 @@ else
|
|||||||
if [ $targetArch != x86_gcc2 ]; then
|
if [ $targetArch != x86_gcc2 ]; then
|
||||||
script="${script}_gcc4"
|
script="${script}_gcc4"
|
||||||
scriptArgs="$targetMachine"
|
scriptArgs="$targetMachine"
|
||||||
|
set_default_value HAIKU_USE_GCC_GRAPHITE_$targetArch \
|
||||||
|
$useGccGraphiteDefault
|
||||||
fi
|
fi
|
||||||
secondaryArch=
|
secondaryArch=
|
||||||
if [ -z "$isPrimaryArch" ]; then
|
if [ -z "$isPrimaryArch" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user