ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-06-01 23:30:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libc/glib: pass installation subdir to backend

Browse Source 
When building a multilib variant, install in a separate directory, to
avoid clutering the default or any other variant.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2011-11-22 00:16:37 +01:00
parent 170091aa2a
commit cfb908d2ee
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/build/libc/glibc-eglibc.sh-common
View File

@ -69,9 +69,11 @@ do_libc() {
# Parameter : Definition : Type : Default # Parameter : Definition : Type : Default
# libc_mode : 'startfiles' or 'final' : string : (none) # libc_mode : 'startfiles' or 'final' : string : (none)
# 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)
do_libc_backend() { do_libc_backend() {
local libc_mode local libc_mode
local extra_flags local extra_flags
local extra_dir
local src_dir="${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}" local src_dir="${CT_SRC_DIR}/${CT_LIBC}-${CT_LIBC_VERSION}"
local extra_cc_args local extra_cc_args
local -a extra_config local -a extra_config
@ -90,8 +92,8 @@ do_libc_backend() {
final) CT_DoStep INFO "Installing C library";; final) CT_DoStep INFO "Installing C library";;
*) CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";; *) CT_Abort "Unsupported (or unset) libc_mode='${libc_mode}'";;
esac esac
mkdir -p "${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}" cd "${CT_BUILD_DIR}/build-libc-${libc_mode}${extra_dir//\//_}"
CT_DoLog EXTRA "Configuring C library" CT_DoLog EXTRA "Configuring C library"
@ -269,7 +271,7 @@ do_libc_backend() {
# use the 'install-headers' makefile target to install the # use the 'install-headers' makefile target to install the
# headers # headers
CT_DoExecLog ALL make ${JOBSFLAGS} \ CT_DoExecLog ALL make ${JOBSFLAGS} \
install_root=${CT_SYSROOT_DIR} \ install_root=${CT_SYSROOT_DIR}${extra_dir} \
install-bootstrap-headers=yes \ install-bootstrap-headers=yes \
"${extra_make_args[@]}" \ "${extra_make_args[@]}" \
install-headers install-headers
@ -306,12 +308,12 @@ do_libc_backend() {
# there are a few object files needed to link shared libraries, # there are a few object files needed to link shared libraries,
# which we build and install by hand # 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} \ CT_DoExecLog ALL make ${JOBSFLAGS} \
"${extra_make_args[@]}" \ "${extra_make_args[@]}" \
csu/subdir_lib csu/subdir_lib
CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \ 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. # Finally, 'libgcc_s.so' requires a 'libc.so' to link against.
# However, since we will never actually execute its code, # However, since we will never actually execute its code,
@ -321,7 +323,7 @@ do_libc_backend() {
-nostartfiles \ -nostartfiles \
-shared \ -shared \
-x c /dev/null \ -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 fi # threads == nptl
else # libc_mode = final else # libc_mode = final
CT_DoLog EXTRA "Building C library" CT_DoLog EXTRA "Building C library"
@ -332,7 +334,7 @@ do_libc_backend() {
CT_DoLog EXTRA "Installing C library" CT_DoLog EXTRA "Installing C library"
CT_DoExecLog ALL make ${JOBSFLAGS} \ CT_DoExecLog ALL make ${JOBSFLAGS} \
"${extra_make_args[@]}" \ "${extra_make_args[@]}" \
install_root="${CT_SYSROOT_DIR}" \ install_root="${CT_SYSROOT_DIR}${extra_dir}" \
install install
if [ "${CT_BUILD_MANUALS}" = "y" ]; then if [ "${CT_BUILD_MANUALS}" = "y" ]; then