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

From: korli@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 10 Apr 2013 19:18:53 +0200 (CEST)
hrev45478 adds 1 changeset to branch 'master'
old head: 429ae1b15159a177a5354d8f83d90fea164b6ffa
new head: e0d1980015ec521a67af5f7bcadd5d4630ddba5a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e0d1980+%5E429ae1b

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

e0d1980: GCC4 cross tools: build libGMP before PPL and CLooG
  
  * libGMP is actually a CLooG dependency, we now build it before CLooG
  and tell to GCC where to find it when Graphite build is activated.

                                   [ Jerome Duval <jerome.duval@xxxxxxxxx> ]

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

Revision:    hrev45478
Commit:      e0d1980015ec521a67af5f7bcadd5d4630ddba5a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e0d1980
Author:      Jerome Duval <jerome.duval@xxxxxxxxx>
Date:        Wed Apr 10 16:37:13 2013 UTC

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

1 file changed, 13 insertions(+), 3 deletions(-)
build/scripts/build_cross_tools_gcc4 | 16 +++++++++++++---

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

diff --git a/build/scripts/build_cross_tools_gcc4 
b/build/scripts/build_cross_tools_gcc4
index 21eb6b5..6eae4c8 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -114,15 +114,17 @@ mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
 
 if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
        cloogSourceDir=$buildToolsDir/cloog
+       gmpSourceDir=$buildToolsDir/gcc/gmp
        pplSourceDir=$buildToolsDir/ppl
 
        pplObjDir=$objDir/ppl
+       gmpObjDir=$objDir/gmp
        cloogObjDir=$objDir/cloog
-       mkdir -p $pplObjDir $cloogObjDir || exit 1
+       mkdir -p $pplObjDir $gmpObjDir $cloogObjDir || exit 1
        
        gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \
                --enable-cloog-backend=isl --with-ppl=$installDir \
-               --disable-cloog-version-check"
+               --disable-cloog-version-check --with-gmp=$installDir"
 fi
 
 # force the POSIX locale, as the build (makeinfo) might choke otherwise
@@ -139,6 +141,13 @@ $MAKE $additionalMakeArgs install || exit 1
 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
+       $MAKE $additionalMakeArgs || exit 1
+       $MAKE $additionalMakeArgs install || exit 1
+       
        # build ppl
        cd $pplObjDir
        CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure 
--prefix=$installDir \
@@ -150,7 +159,8 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
        # build cloog
        cd $cloogObjDir
        CFLAGS="-O2" CXXFLAGS="-O2" $cloogSourceDir/configure \
-               --prefix=$installDir --disable-nls --disable-shared || exit 1
+               --prefix=$installDir --disable-nls --disable-shared \
+               --with-gmp-prefix=$installDir || exit 1
        $MAKE $additionalMakeArgs || exit 1
        $MAKE $additionalMakeArgs install || exit 1
 fi
[haiku-commits] haiku: hrev45478 - build/scripts

Other related posts:
