mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-02-20 17:12:55 +00:00
[libc-eglibc] Rewrite part of the code
Rewrite part of the code to better match the rest. Most notably, rewrite handling of: if [ ... ] && [ ... ] to: if [ ... -a ... ] This has the positive side effect of calling "[" only once, although "[" is probably a shell built-in.
This commit is contained in:
parent
795d135b7f
commit
e4855367b4
@ -41,19 +41,21 @@ do_libc_get() {
|
||||
eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2"
|
||||
|
||||
# Check if every tarballs are already present
|
||||
if [ -f "${CT_TARBALLS_DIR}/${eglibc}" ] && \
|
||||
[ -f "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \
|
||||
[ -f "${CT_TARBALLS_DIR}/${eglibc_localedef}" ] && \
|
||||
[ -f "${CT_TARBALLS_DIR}/${eglibc_ports}" ]; then
|
||||
if [ -f "${CT_TARBALLS_DIR}/${eglibc}" \
|
||||
-a -f "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" \
|
||||
-a -f "${CT_TARBALLS_DIR}/${eglibc_localedef}" \
|
||||
-a -f "${CT_TARBALLS_DIR}/${eglibc_ports}" \
|
||||
]; then
|
||||
CT_DoLog DEBUG "Already have 'eglibc-${CT_LIBC_VERSION}'"
|
||||
return 0
|
||||
fi
|
||||
|
||||
if [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" ] && \
|
||||
[ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \
|
||||
[ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" ] && \
|
||||
[ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" ] && \
|
||||
[ "${CT_FORCE_DOWNLOAD}" != "y" ]; then
|
||||
if [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" \
|
||||
-a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" \
|
||||
-a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" \
|
||||
-a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" \
|
||||
"${CT_FORCE_DOWNLOAD}" != "y" \
|
||||
]; then
|
||||
CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage"
|
||||
for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do
|
||||
CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user