From 575cfdf28af16ec780388587967d800f166ac3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 11 Apr 2013 17:57:42 +0200 Subject: [PATCH] GCC4 cross tools: fixes the build with --use-gcc-graphite on another machine * libsupc++ wasn't required, the build failed on x86_64. * PPL: --disable-maintainer-mode configure option seems not enough to avoid an autoconf launch. Solved by redefined AUTOCONF AUTOHEADER ACLOCAL AUTOMAKE variables to the noop command "true". --- build/scripts/build_cross_tools_gcc4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4 index 86083d84ee..d08db67791 100755 --- a/build/scripts/build_cross_tools_gcc4 +++ b/build/scripts/build_cross_tools_gcc4 @@ -125,7 +125,7 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then gccConfigureArgs="$gccConfigureArgs --with-cloog=$installDir \ --enable-cloog-backend=isl --with-ppl=$installDir \ --disable-cloog-version-check --with-gmp=$installDir \ - --with-host-libstdcxx=\"-lstdc++ -lsupc++\"" + --with-host-libstdcxx=\"-lstdc++\"" fi # force the POSIX locale, as the build (makeinfo) might choke otherwise @@ -154,8 +154,8 @@ if [ "$HAIKU_USE_GCC_GRAPHITE" = 1 ]; then CFLAGS="-O2" CXXFLAGS="-O2" $pplSourceDir/configure --prefix=$installDir \ --disable-nls --disable-shared --disable-watchdog \ --disable-maintainer-mode || exit 1 - $MAKE $additionalMakeArgs || exit 1 - $MAKE $additionalMakeArgs install || exit 1 + $MAKE $additionalMakeArgs AUTOCONF:=true AUTOHEADER:=true ACLOCAL:=true AUTOMAKE:=true || exit 1 + $MAKE $additionalMakeArgs install AUTOCONF:=true AUTOHEADER:=true ACLOCAL:=true AUTOMAKE:=true || exit 1 # build cloog cd $cloogObjDir