ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-31 16:36:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

glibc: Build manuals and locales last

Browse Source 
Rather then building the manuals and locales for each multilib target, only
build the manuals on the last multilib target.

If you are not building a multilib toolchain, then the first libc build will
be the last.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
This commit is contained in:
Ray Donnelly 2014-04-12 13:19:06 +01:00 committed by Alexey Neyman
parent 27fed7e5f0
commit cc86d80da2
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/build/libc/glibc.sh
View File

@ -72,6 +72,7 @@ do_libc_backend() {
local multilib local multilib
local multi_dir local multi_dir
local multi_flags local multi_flags
local multi_last
local target local target
local extra_dir local extra_dir
local target local target
@ -102,7 +103,14 @@ do_libc_backend() {
# If gcc is not configured for multilib, it still prints # If gcc is not configured for multilib, it still prints
# a single line for the default settings # a single line for the default settings
multilibs=( $("${CT_TARGET}-gcc" -print-multi-lib 2>/dev/null) ) multilibs=( $("${CT_TARGET}-gcc" -print-multi-lib 2>/dev/null) )
last_multi=
for multilib in "${multilibs[@]}"; do for multilib in "${multilibs[@]}"; do
last_multi=$(( ${#multilibs[@]} - 1 ))
if [ "${multilib%%;*}" = "${multilibs[last_multi]%%;*}" ]; then
# This is the last multilib build or multilib is '.'
# (default target, not multilib)
multi_last=y
fi
multi_dir="${multilib%%;*}" multi_dir="${multilib%%;*}"
if [ "${multi_dir}" != "." ]; then if [ "${multi_dir}" != "." ]; then
CT_DoStep INFO "Building for multilib subdir='${multi_dir}'" CT_DoStep INFO "Building for multilib subdir='${multi_dir}'"
@ -167,7 +175,8 @@ do_libc_backend() {
libc_headers="${libc_headers}" \ libc_headers="${libc_headers}" \
libc_startfiles="${libc_startfiles}" \ libc_startfiles="${libc_startfiles}" \
libc_full="${libc_full}" \ libc_full="${libc_full}" \
libc_target="${target}" libc_target="${target}" \
multi_last="${multi_last}"
CT_Popd CT_Popd
if [ "${multi_dir}" != "." ]; then if [ "${multi_dir}" != "." ]; then
@ -188,6 +197,7 @@ do_libc_backend() {
# libc_full : Build full libc : bool : n # libc_full : Build full libc : bool : n
# extra_flags : Extra CFLAGS to use (for multilib) : string : (empty) # extra_flags : Extra CFLAGS to use (for multilib) : string : (empty)
# extra_dir : Extra subdir for multilib : string : (empty) # extra_dir : Extra subdir for multilib : string : (empty)
# multi_last : The last multilib target : bool : n
do_libc_backend_once() { do_libc_backend_once() {
local libc_headers local libc_headers
local libc_startfiles local libc_startfiles
@ -205,6 +215,7 @@ do_libc_backend_once() {
local float_extra local float_extra
local endian_extra local endian_extra
local libc_target="${CT_TARGET}" local libc_target="${CT_TARGET}"
local multi_last
local arg local arg
for arg in "$@"; do for arg in "$@"; do
@ -499,7 +510,10 @@ do_libc_backend_once() {
install_root="${install_root}" \ install_root="${install_root}" \
install install
if [ "${CT_BUILD_MANUALS}" = "y" ]; then if [ "${CT_BUILD_MANUALS}" = "y" -a "${multi_last}" = "y" ]; then
# We only need to build the manuals once. Only build them on the
# last multilib target. If it's not multilib, it will happen on the
# only target.
CT_DoLog EXTRA "Building and installing the C library manual" CT_DoLog EXTRA "Building and installing the C library manual"
# Omit JOBSFLAGS as GLIBC has problems building the # Omit JOBSFLAGS as GLIBC has problems building the
# manuals in parallel # manuals in parallel
@ -510,7 +524,7 @@ do_libc_backend_once() {
${CT_PREFIX_DIR}/share/doc ${CT_PREFIX_DIR}/share/doc
fi fi
if [ "${CT_LIBC_LOCALES}" = "y" ]; then if [ "${CT_LIBC_LOCALES}" = "y" -a "${multi_last}" = "y" ]; then
do_libc_locales do_libc_locales
fi fi
fi # libc_full == y fi # libc_full == y