i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: --use-gcc-pipe now affects build_cross_tools_gcc4.

Browse Source
This commit is contained in:
Jérôme Duval
2014-02-09 10:06:43 +01:00
parent aa0797a228
commit b3ece9056d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_cross_tools_gcc4
+12 -6
View File
@@ -17,6 +17,8 @@ shift 4
additionalMakeArgs=$* additionalMakeArgs=$*
kernelCcFlags="-D_KERNEL_MODE" kernelCcFlags="-D_KERNEL_MODE"
ccFlags="-O2"
cxxFlags="-O2"
case $haikuMachine in case $haikuMachine in
x86_64-*) x86_64-*)
# GCC's default is to enable multilib, but there is a bug when # GCC's default is to enable multilib, but there is a bug when
@@ -124,6 +126,10 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
--with-gmp=$installDir \ --with-gmp=$installDir \
--with-host-libstdcxx=\"-lstdc++\"" --with-host-libstdcxx=\"-lstdc++\""
fi fi
if [ "$HAIKU_USE_GCC_PIPE" = 1 ]; then
ccFlags="$ccFlags -pipe"
cxxFlags="$cxxFlags -pipe"
fi
if [ -n "$SECONDARY_ARCH" ]; then if [ -n "$SECONDARY_ARCH" ]; then
gccConfigureArgs="$gccConfigureArgs --with-hybrid-secondary=$SECONDARY_ARCH" gccConfigureArgs="$gccConfigureArgs --with-hybrid-secondary=$SECONDARY_ARCH"
@@ -134,7 +140,7 @@ export LC_ALL=POSIX
# build binutils # build binutils
cd "$binutilsObjDir" cd "$binutilsObjDir"
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$binutilsSourceDir/configure" \ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$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 \
@@ -149,14 +155,14 @@ export PATH=$PATH:"$installDir/bin"
if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
# build gmp # build gmp
cd "$gmpObjDir" cd "$gmpObjDir"
"$gmpSourceDir/configure" --prefix="$installDir" \ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$gmpSourceDir/configure" \
--disable-shared --enable-cxx || exit 1 --prefix="$installDir" --disable-shared --enable-cxx || exit 1
$MAKE $additionalMakeArgs || exit 1 $MAKE $additionalMakeArgs || exit 1
$MAKE $additionalMakeArgs install || exit 1 $MAKE $additionalMakeArgs install || exit 1
# build isl # build isl
cd "$islObjDir" cd "$islObjDir"
CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" "$islSourceDir/configure" \ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$islSourceDir/configure" \
--prefix="$installDir" --disable-nls --disable-shared \ --prefix="$installDir" --disable-nls --disable-shared \
--with-gmp-prefix="$installDir" || exit 1 --with-gmp-prefix="$installDir" || exit 1
$MAKE $additionalMakeArgs || exit 1 $MAKE $additionalMakeArgs || exit 1
@@ -164,7 +170,7 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
# build cloog # build cloog
cd "$cloogObjDir" cd "$cloogObjDir"
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$cloogSourceDir/configure" \ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$cloogSourceDir/configure" \
--prefix="$installDir" --disable-nls --disable-shared \ --prefix="$installDir" --disable-nls --disable-shared \
--with-gmp-prefix="$installDir" --with-isl-prefix=="$installDir" \ --with-gmp-prefix="$installDir" --with-isl-prefix=="$installDir" \
|| exit 1 || exit 1
@@ -195,7 +201,7 @@ copy_headers "$haikuSourceDir/headers/posix" "$tmpIncludeDir/posix"
# configure gcc # configure gcc
cd "$gccObjDir" cd "$gccObjDir"
CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$gccSourceDir/configure" \ CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$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 \
configure
Vendored
+1
View File
@@ -787,6 +787,7 @@ else
SECONDARY_ARCH=$secondaryArch \ SECONDARY_ARCH=$secondaryArch \
HAIKU_USE_GCC_GRAPHITE=`get_variable \ HAIKU_USE_GCC_GRAPHITE=`get_variable \
HAIKU_USE_GCC_GRAPHITE_$targetArch` \ HAIKU_USE_GCC_GRAPHITE_$targetArch` \
HAIKU_USE_GCC_PIPE=$HAIKU_USE_GCC_PIPE \
"$script" $scriptArgs "$sourceDir" "$buildCrossTools" \ "$script" $scriptArgs "$sourceDir" "$buildCrossTools" \
"$crossToolsDir" $buildCrossToolsJobs || exit 1 "$crossToolsDir" $buildCrossToolsJobs || exit 1
crossToolsPrefix="$crossToolsDir/bin/${targetMachine}-" crossToolsPrefix="$crossToolsDir/bin/${targetMachine}-"