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

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 11 Apr 2013 18:02:35 +0200 (CEST)

hrev45481 adds 1 changeset to branch 'master'
old head: 341c03f98826b100b0a2073329b5493c79a7f2cc
new head: 575cfdf28af16ec780388587967d800f166ac3eb
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=575cfdf+%5E341c03f

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

575cfdf: 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".

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

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

Revision:    hrev45481
Commit:      575cfdf28af16ec780388587967d800f166ac3eb
URL:         http://cgit.haiku-os.org/haiku/commit/?id=575cfdf
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Thu Apr 11 15:57:42 2013 UTC

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

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

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

diff --git a/build/scripts/build_cross_tools_gcc4 
b/build/scripts/build_cross_tools_gcc4
index 86083d8..d08db67 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


Other related posts:

  • » [haiku-commits] haiku: hrev45481 - build/scripts - korli