diff -r 09abd5f4295b -r 5b2025372db7 scripts/build/libc/glibc-eglibc.sh-common
--- a/scripts/build/libc/glibc-eglibc.sh-common	Tue Nov 22 00:11:51 2011 +0100
+++ b/scripts/build/libc/glibc-eglibc.sh-common	Tue Nov 22 00:16:37 2011 +0100
@@ -69,9 +69,11 @@
 #   Parameter           : Definition                            : Type      : Default
 #   libc_mode           : 'startfiles' or 'final'               : string    : (none)
 #   extra_flags         : Extra CFLAGS to use (for multilib)    : string    : (empty)
+#   extra_dir           : Extra subdir for multilib             : string    : (empty)
 do_libc_backend() {
     local libc_mode
     local extra_flags
+    local extra_dir
     local src_dir="${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}"
     local extra_cc_args
     local -a extra_config
@@ -90,8 +92,8 @@
         final)      CT_DoStep INFO "Installing C library";;
         *)          CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";;
     esac
-    mkdir -p "${CT_BUILD_DIR}/build-libc-${libc_mode}"
-    cd "${CT_BUILD_DIR}/build-libc-${libc_mode}"
+    mkdir -p "${CT_BUILD_DIR}/build-libc-${libc_mode}${extra_dir//\//_}"
+    cd "${CT_BUILD_DIR}/build-libc-${libc_mode}${extra_dir//\//_}"
 
     CT_DoLog EXTRA "Configuring C library"
 
@@ -269,7 +271,7 @@
         # use the 'install-headers' makefile target to install the
         # headers
         CT_DoExecLog ALL make ${JOBSFLAGS}              \
-                         install_root=${CT_SYSROOT_DIR} \
+                         install_root=${CT_SYSROOT_DIR}${extra_dir} \
                          install-bootstrap-headers=yes  \
                          "${extra_make_args[@]}"        \
                          install-headers
@@ -306,12 +308,12 @@
 
             # there are a few object files needed to link shared libraries,
             # which we build and install by hand
-            CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}/usr/lib"
+            CT_DoExecLog ALL mkdir -p "${CT_SYSROOT_DIR}${extra_dir}/usr/lib"
             CT_DoExecLog ALL make ${JOBSFLAGS}  \
                         "${extra_make_args[@]}" \
                         csu/subdir_lib
             CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \
-                                "${CT_SYSROOT_DIR}/usr/lib"
+                                "${CT_SYSROOT_DIR}${extra_dir}/usr/lib"
 
             # Finally, 'libgcc_s.so' requires a 'libc.so' to link against.
             # However, since we will never actually execute its code,
@@ -321,7 +323,7 @@
                                            -nostartfiles    \
                                            -shared          \
                                            -x c /dev/null   \
-                                           -o "${CT_SYSROOT_DIR}/usr/lib/libc.so"
+                                           -o "${CT_SYSROOT_DIR}${extra_dir}/usr/lib/libc.so"
         fi # threads == nptl
     else # libc_mode = final
         CT_DoLog EXTRA "Building C library"
@@ -332,7 +334,7 @@
         CT_DoLog EXTRA "Installing C library"
         CT_DoExecLog ALL make ${JOBSFLAGS}                      \
                               "${extra_make_args[@]}"           \
-                              install_root="${CT_SYSROOT_DIR}"  \
+                              install_root="${CT_SYSROOT_DIR}${extra_dir}"  \
                               install
 
         if [ "${CT_BUILD_MANUALS}" = "y" ]; then