From 49ab32ffe2c0da1e7d6dcbb10e29f9b95a97ca2c Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 22 Jan 2011 22:35:43 +0100
Subject: scripts: PARALLELMFLAGS is evil, rename

The reunification of the glibc/eglibc code paths exposed a nasty
bug in the glibc build: use of PARALLELMFLAGS breaks the build.

See the explanations in that bug report against FC6:
    https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=212111

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 scripts/build/debug/300-gdb.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts/build/debug')

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 5a7d87fc..6f794f29 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -123,7 +123,7 @@ do_debug_gdb_build() {
             "${cross_extra_config[@]}"
 
         CT_DoLog EXTRA "Building cross-gdb"
-        CT_DoExecLog ALL make ${PARALLELMFLAGS}
+        CT_DoExecLog ALL make ${JOBSFLAGS}
 
         CT_DoLog EXTRA "Installing cross-gdb"
         CT_DoExecLog ALL make install
@@ -169,8 +169,8 @@ do_debug_gdb_build() {
             # extension appended to executables. Find that.
             tic_ext=$(grep -E '^x[[:space:]]*=' progs/Makefile |sed -r -e 's/^.*=[[:space:]]*//;')
 
-            CT_DoExecLog ALL make ${PARALLELMFLAGS} -C include
-            CT_DoExecLog ALL make ${PARALLELMFLAGS} -C progs "tic${tic_ext}"
+            CT_DoExecLog ALL make ${JOBSFLAGS} -C include
+            CT_DoExecLog ALL make ${JOBSFLAGS} -C progs "tic${tic_ext}"
 
             CT_DoExecLog ALL install -d -m 0755 "${CT_PREFIX_DIR}/buildtools"
             CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_PREFIX_DIR}/buildtools"
@@ -192,7 +192,7 @@ do_debug_gdb_build() {
                 --enable-termcap                                                \
                 "${ncurses_opts[@]}"
 
-            CT_DoExecLog ALL make ${PARALLELMFLAGS}
+            CT_DoExecLog ALL make ${JOBSFLAGS}
 
             CT_DoExecLog ALL make install
 
@@ -219,7 +219,7 @@ do_debug_gdb_build() {
                 --enable-static                                             \
                 --disable-shared
 
-            CT_DoExecLog ALL make ${PARALLELMFLAGS}
+            CT_DoExecLog ALL make ${JOBSFLAGS}
             CT_DoExecLog ALL make install
 
             native_extra_config+=("--with-expat")
@@ -269,7 +269,7 @@ do_debug_gdb_build() {
             "${native_extra_config[@]}"
 
         CT_DoLog EXTRA "Building native gdb"
-        CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
+        CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
 
         CT_DoLog EXTRA "Installing native gdb"
         CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
@@ -334,7 +334,7 @@ do_debug_gdb_build() {
             "${gdbserver_extra_config[@]}"
 
         CT_DoLog EXTRA "Building gdbserver"
-        CT_DoExecLog ALL make ${PARALLELMFLAGS} CC=${CT_TARGET}-${CT_CC}
+        CT_DoExecLog ALL make ${JOBSFLAGS} CC=${CT_TARGET}-${CT_CC}
 
         CT_DoLog EXTRA "Installing gdbserver"
         CT_DoExecLog ALL make DESTDIR="${CT_DEBUGROOT_DIR}" install
-- 
cgit v1.2.3