/devel/gcc-4.4:

- fix buildging glibc in //

 -------- diffstat follows --------
 /devel/gcc-4.4/scripts/build/libc/glibc.sh |   25    17     8     0 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

1 files changed, 17 insertions, 8 deletions

diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 3fcda91..9af0135 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -172,6 +172,7 @@ do_libc_headers() {
         CT_DoExecLog ALL                                \
         make CFLAGS="-O -DBOOTSTRAP_GCC"                \
              OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"    \
+             PARALLELMFLAGS="${PARALLELMFLAGS}"         \
              sysdeps/gnu/errlist.c
         mkdir -p stdio-common
 
@@ -189,6 +190,7 @@ do_libc_headers() {
          CFLAGS="-O -DBOOTSTRAP_GCC"                \
          ${LIBC_SYSROOT_ARG}                        \
          OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"    \
+         PARALLELMFLAGS="${PARALLELMFLAGS}"         \
          install-headers
 
     # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
@@ -331,11 +333,12 @@ do_libc_start_files() {
         ${extra_config}                                             \
         ${CT_LIBC_GLIBC_EXTRA_CONFIG}
 
-
     #TODO: should check whether slibdir has been set in configparms to */lib64
     #      and copy the startfiles into the appropriate libdir.
     CT_DoLog EXTRA "Building C library start files"
-    CT_DoExecLog ALL make OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" csu/subdir_lib
+    CT_DoExecLog ALL make OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"   \
+                          PARALLELMFLAGS="${PARALLELMFLAGS}"        \
+                          csu/subdir_lib
 
     CT_DoLog EXTRA "Installing C library start files"
     if [ "${CT_USE_SYSROOT}" = "y" ]; then
@@ -499,18 +502,19 @@ do_libc() {
     # then you need to set the KERNELCONFIG variable to point to a .config file for this arch.
     # The following architectures are known to need kernel .config: alpha, arm, ia64, s390, sh, sparc
     # Note: LD and RANLIB needed by glibc-2.1.3's c_stub directory, at least on macosx
-    # No need for PARALLELMFLAGS here, Makefile already reads this environment variable
     CT_DoLog EXTRA "Building C library"
     CT_DoExecLog ALL make LD=${CT_TARGET}-ld                        \
-                           RANLIB=${CT_TARGET}-ranlib               \
-                           OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"  \
-                           ASFLAGS="${GLIBC_INITIAL_BUILD_ASFLAGS}" \
-                           ${GLIBC_INITIAL_BUILD_RULE}
+                          RANLIB=${CT_TARGET}-ranlib                \
+                          OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"   \
+                          ASFLAGS="${GLIBC_INITIAL_BUILD_ASFLAGS}"  \
+                          PARALLELMFLAGS="${PARALLELMFLAGS}"        \
+                          ${GLIBC_INITIAL_BUILD_RULE}
 
     CT_DoLog EXTRA "Installing C library"
     CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}"          \
                           ${LIBC_SYSROOT_ARG}                       \
                           OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"   \
+                          PARALLELMFLAGS="${PARALLELMFLAGS}"        \
                           ${GLIBC_INITIAL_INSTALL_RULE}
 
     # This doesn't seem to work when building a crosscompiler,
@@ -553,7 +557,11 @@ do_libc_finish() {
     cd "${CT_BUILD_DIR}/build-libc"
 
     CT_DoLog EXTRA "Re-building C library"
-    CT_DoExecLog ALL make LD=${CT_TARGET}-ld RANLIB=${CT_TARGET}-ranlib
+    CT_DoExecLog ALL make LD=${CT_TARGET}-ld                        \
+                          RANLIB=${CT_TARGET}-ranlib                \
+                          OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"   \
+                          ASFLAGS="${GLIBC_INITIAL_BUILD_ASFLAGS}"  \
+                          PARALLELMFLAGS="${PARALLELMFLAGS}"
 
     CT_DoLog EXTRA "Installing missing C library components"
     # note: should do full install and then fix linker scripts, but this is faster
@@ -561,6 +569,7 @@ do_libc_finish() {
         CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}"          \
                               ${LIBC_SYSROOT_ARG}                       \
                               OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"   \
+                              PARALLELMFLAGS="${PARALLELMFLAGS}"        \
                               install-${t}
     done