summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-01-19 23:27:36 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-01-19 23:27:36 (GMT)
commit0b773f5823abc9b6dda5b6cee8ef65b17a364eb6 (patch)
treef21bc84a86a6c86cf6b8b1a0f10508951b3cd28c
parent129bf2fa66e33b248f5560af96fe2485643f42b1 (diff)
libc/glibc-eglibc: misc janitorial cleanups.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-rw-r--r--scripts/build/libc/glibc-eglibc.sh-common16
-rw-r--r--scripts/build/libc/glibc.sh4
2 files changed, 12 insertions, 8 deletions
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 4c60b4b..d77baea 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -10,7 +10,7 @@ do_libc_headers() {
do_libc_start_files() {
local src_dir="${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}"
- CT_DoStep INFO "Installing C library headers / start files"
+ CT_DoStep INFO "Installing C library headers & start files"
mkdir -p "${CT_BUILD_DIR}/build-libc-startfiles"
cd "${CT_BUILD_DIR}/build-libc-startfiles"
@@ -55,10 +55,10 @@ do_libc_start_files() {
# use the 'install-headers' makefile target to install the
# headers
- CT_DoExecLog ALL \
- make install-headers \
- install_root=${CT_SYSROOT_DIR} \
- install-bootstrap-headers=yes
+ CT_DoExecLog ALL make ${JOBSFLAGS} \
+ install_root=${CT_SYSROOT_DIR} \
+ install-bootstrap-headers=yes \
+ install-headers
# For glibc, a few headers need to be manually installed
if [ "${CT_LIBC}" = "glibc" ]; then
@@ -87,7 +87,7 @@ do_libc_start_files() {
# 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 make csu/subdir_lib
+ CT_DoExecLog ALL make ${JOBSFLAGS} csu/subdir_lib
CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \
"${CT_SYSROOT_DIR}/usr/lib"
@@ -238,12 +238,12 @@ do_libc() {
esac
CT_DoLog EXTRA "Building C library"
- CT_DoExecLog ALL make -j${CT_PARALLEL_JOBS} \
+ CT_DoExecLog ALL make ${JOBSFLAGS} \
"${extra_make_args[@]}" \
all
CT_DoLog EXTRA "Installing C library"
- CT_DoExecLog ALL make -j${CT_PARALLEL_JOBS} \
+ CT_DoExecLog ALL make ${JOBSFLAGS} \
"${extra_make_args[@]}" \
install_root="${CT_SYSROOT_DIR}" \
install
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index fad673c..8e213fb 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -5,6 +5,10 @@
# Add the definitions common to glibc and eglibc
# do_libc_headers
# do_libc_start_files
+# do_libc
+# do_libc_finish
+# do_libc_add_ons_list
+# do_libc_min_kernel_config
. "${CT_LIB_DIR}/scripts/build/libc/glibc-eglibc.sh-common"
# Download glibc