[haiku-commits] haiku: hrev46845 - build/scripts

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 9 Feb 2014 10:09:54 +0100 (CET)

hrev46845 adds 1 changeset to branch 'master'
old head: aa0797a228b80c7bd90393cbe18968f6ad64d45f
new head: b3ece9056dd49388bee911aa095d22db604916db
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b3ece90+%5Eaa0797a

----------------------------------------------------------------------------

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

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46845
Commit:      b3ece9056dd49388bee911aa095d22db604916db
URL:         http://cgit.haiku-os.org/haiku/commit/?id=b3ece90
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sun Feb  9 09:06:43 2014 UTC

----------------------------------------------------------------------------

2 files changed, 13 insertions(+), 6 deletions(-)
build/scripts/build_cross_tools_gcc4 | 18 ++++++++++++------
configure                            |  1 +

----------------------------------------------------------------------------

diff --git a/build/scripts/build_cross_tools_gcc4 
b/build/scripts/build_cross_tools_gcc4
index 2be22ab..e6f5cd2 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -17,6 +17,8 @@ shift 4
 additionalMakeArgs=$*
 
 kernelCcFlags="-D_KERNEL_MODE"
+ccFlags="-O2"
+cxxFlags="-O2"
 case $haikuMachine in
 x86_64-*)
        # 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-host-libstdcxx=\"-lstdc++\""
 fi
+if [ "$HAIKU_USE_GCC_PIPE" = 1 ]; then
+       ccFlags="$ccFlags -pipe"
+       cxxFlags="$cxxFlags -pipe"
+fi
 
 if [ -n "$SECONDARY_ARCH" ]; then
        gccConfigureArgs="$gccConfigureArgs 
--with-hybrid-secondary=$SECONDARY_ARCH"
@@ -134,7 +140,7 @@ export LC_ALL=POSIX
 
 # build binutils
 cd "$binutilsObjDir"
-CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$binutilsSourceDir/configure" \
+CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$binutilsSourceDir/configure" \
        --prefix="$installDir" $buildHostSpec --target=$haikuMachine \
        --enable-targets=$haikuMachine,i386-efi-pe,x86_64-efi-pe \
        --disable-nls --disable-shared --disable-werror \
@@ -149,14 +155,14 @@ export PATH=$PATH:"$installDir/bin"
 if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
        # build gmp
        cd "$gmpObjDir"
-       "$gmpSourceDir/configure" --prefix="$installDir" \
-               --disable-shared --enable-cxx || exit 1
+       CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$gmpSourceDir/configure" \
+               --prefix="$installDir" --disable-shared --enable-cxx || exit 1
        $MAKE $additionalMakeArgs || exit 1
        $MAKE $additionalMakeArgs install || exit 1
 
        # build isl
        cd "$islObjDir"
-       CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" "$islSourceDir/configure" \
+       CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$islSourceDir/configure" \
                --prefix="$installDir" --disable-nls --disable-shared \
                 --with-gmp-prefix="$installDir" || exit 1
        $MAKE $additionalMakeArgs || exit 1
@@ -164,7 +170,7 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
 
        # build cloog
        cd "$cloogObjDir"
-       CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$cloogSourceDir/configure" \
+       CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$cloogSourceDir/configure" \
                --prefix="$installDir" --disable-nls --disable-shared \
                --with-gmp-prefix="$installDir" 
--with-isl-prefix=="$installDir" \
                || exit 1
@@ -195,7 +201,7 @@ copy_headers "$haikuSourceDir/headers/posix" 
"$tmpIncludeDir/posix"
 
 # configure gcc
 cd "$gccObjDir"
-CFLAGS="-O2 -pipe" CXXFLAGS="-O2" "$gccSourceDir/configure" \
+CFLAGS="$ccFlags" CXXFLAGS="$cxxFlags" "$gccSourceDir/configure" \
        --prefix="$installDir" $buildHostSpec --target=$haikuMachine \
        --disable-nls --disable-shared --with-system-zlib \
        --enable-languages=c,c++ --enable-lto --enable-frame-pointer \
diff --git a/configure b/configure
index d52290f..b0b5451 100755
--- a/configure
+++ b/configure
@@ -787,6 +787,7 @@ else
                        SECONDARY_ARCH=$secondaryArch \
                        HAIKU_USE_GCC_GRAPHITE=`get_variable \
                                HAIKU_USE_GCC_GRAPHITE_$targetArch` \
+                       HAIKU_USE_GCC_PIPE=$HAIKU_USE_GCC_PIPE \
                        "$script" $scriptArgs "$sourceDir" "$buildCrossTools" \
                                "$crossToolsDir" $buildCrossToolsJobs || exit 1
                        crossToolsPrefix="$crossToolsDir/bin/${targetMachine}-"


Other related posts: