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.
This commit is contained in:
@@ -114,15 +114,17 @@ 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
|
||||||
pplSourceDir=$buildToolsDir/ppl
|
pplSourceDir=$buildToolsDir/ppl
|
||||||
|
|
||||||
pplObjDir=$objDir/ppl
|
pplObjDir=$objDir/ppl
|
||||||
|
gmpObjDir=$objDir/gmp
|
||||||
cloogObjDir=$objDir/cloog
|
cloogObjDir=$objDir/cloog
|
||||||
mkdir -p $pplObjDir $cloogObjDir || exit 1
|
mkdir -p $pplObjDir $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-ppl=$installDir \
|
||||||
--disable-cloog-version-check"
|
--disable-cloog-version-check --with-gmp=$installDir"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# force the POSIX locale, as the build (makeinfo) might choke otherwise
|
# 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
|
export PATH=$PATH:$installDir/bin
|
||||||
|
|
||||||
if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
|
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
|
# build ppl
|
||||||
cd $pplObjDir
|
cd $pplObjDir
|
||||||
CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \
|
CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \
|
||||||
@@ -150,7 +159,8 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then
|
|||||||
# build cloog
|
# build cloog
|
||||||
cd $cloogObjDir
|
cd $cloogObjDir
|
||||||
CFLAGS="-O2" CXXFLAGS="-O2" $cloogSourceDir/configure \
|
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 || exit 1
|
||||||
$MAKE $additionalMakeArgs install || exit 1
|
$MAKE $additionalMakeArgs install || exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user