mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-06-17 14:58:12 +00:00
scripts/functions: change handling of nochdir
- 'nochdir' must be the first option - have systematic pushd/popd, even if nochdir
This commit is contained in:
@ -38,13 +38,13 @@ do_libc_extract() {
|
||||
CT_Extract "glibc-${CT_LIBC_VERSION}"
|
||||
|
||||
CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
|
||||
CT_Patch "glibc-${CT_LIBC_VERSION}" nochdir
|
||||
CT_Patch nochdir "glibc-${CT_LIBC_VERSION}"
|
||||
|
||||
# C library addons
|
||||
for addon in "${addons_list[@]}"; do
|
||||
# NPTL addon is not to be extracted, in any case
|
||||
[ "${addon}" = "nptl" ] && continue || true
|
||||
CT_Extract "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
|
||||
CT_Extract nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
|
||||
|
||||
# Some addons have the 'long' name, while others have the
|
||||
# 'short' name, but patches are non-uniformly built with
|
||||
@ -54,7 +54,7 @@ do_libc_extract() {
|
||||
# directory, returns true!
|
||||
[ -d "${addon}" ] || CT_DoExecLog ALL ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
|
||||
[ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || CT_DoExecLog ALL ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
|
||||
CT_Patch "glibc-${addon}-${CT_LIBC_VERSION}" nochdir
|
||||
CT_Patch nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
|
||||
done
|
||||
|
||||
# The configure files may be older than the configure.in files
|
||||
|
Reference in New Issue
Block a user