[haiku-commits] haiku: hrev44803 - build/scripts
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 7 Nov 2012 21:57:39 +0100 (CET)
hrev44803 adds 2 changesets to branch 'master'
old head: 9abf4591d5b44b2e3e52190c2b2a427a81be2691
new head: 29468041f9a2dcc863ceb6c52007fff769d8fd97
----------------------------------------------------------------------------
d006487: Force POSIX-locale when building the buildtools
* using a non-POSIX locale may break the build (especially makeinfo),
so we explicitly set the locale to POSIX
2946804: Explicitly use -j1 when building gcc2
* specifying -j1 guards against potential multi-job arguments in
MAKEFLAGS
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 2 deletions(-)
build/scripts/build_cross_tools | 7 +++++--
build/scripts/build_cross_tools_gcc4 | 2 ++
############################################################################
Commit: d006487564e9eae1bd065562bbb4c00c9bcd3273
URL: http://cgit.haiku-os.org/haiku/commit/?id=d006487
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Wed Nov 7 20:38:03 2012 UTC
Force POSIX-locale when building the buildtools
* using a non-POSIX locale may break the build (especially makeinfo),
so we explicitly set the locale to POSIX
----------------------------------------------------------------------------
diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index 3738262..218a825 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -89,6 +89,9 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir
$tmpIncludeDir \
$tmpLibDir || exit 1
mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion
+# force the POSIX locale, as the build (makeinfo) might choke otherwise
+export LC_ALL=POSIX
+
# build binutils
cd $binutilsObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \
diff --git a/build/scripts/build_cross_tools_gcc4
b/build/scripts/build_cross_tools_gcc4
index 976ff9d..320420f 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -110,6 +110,8 @@ mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir
$tmpIncludeDir \
$tmpLibDir || exit 1
mkdir -p $installDir/lib/gcc/$haikuMachine/$gccVersion
+# force the POSIX locale, as the build (makeinfo) might choke otherwise
+export LC_ALL=POSIX
# build binutils
cd $binutilsObjDir
############################################################################
Revision: hrev44803
Commit: 29468041f9a2dcc863ceb6c52007fff769d8fd97
URL: http://cgit.haiku-os.org/haiku/commit/?id=2946804
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Wed Nov 7 20:56:20 2012 UTC
Explicitly use -j1 when building gcc2
* specifying -j1 guards against potential multi-job arguments in
MAKEFLAGS
----------------------------------------------------------------------------
diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index 218a825..cc7c63d 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -97,7 +97,7 @@ cd $binutilsObjDir
CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \
--prefix=$installDir --target=i586-pc-haiku --disable-nls \
--enable-shared=yes --disable-werror || exit 1
-make $additionalMakeArgs || exit 1
+make -j1 $additionalMakeArgs || exit 1
make $additionalMakeArgs install || exit 1
PATH=$PATH:$installDir/bin
@@ -157,7 +157,7 @@ eval "sed $sedExpr Makefile.bak > Makefile" || exit 1
rm Makefile.bak
# make gcc
-make cross || {
+make -j1 cross || {
echo "ERROR: Building gcc failed." >&2
exit 1
}
Other related posts:
