diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/companion_libs/cloog.sh | 11 | ||||
| -rw-r--r-- | scripts/build/libc/eglibc.sh | 2 | ||||
| -rw-r--r-- | scripts/saveSample.sh.in | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh index 0e6d74f..fae3f72 100644 --- a/scripts/build/companion_libs/cloog.sh +++ b/scripts/build/companion_libs/cloog.sh @@ -18,8 +18,17 @@ do_cloog_get() { # Extract CLooG do_cloog_extract() { + local _t + CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}" - CT_Pushd "${CT_SRC_DIR}/cloog-ppl" + + # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!) + # while versions 0.15.4 onward do have the version in the dirname. + case "${CT_CLOOG_VERSION}" in + 0.15.3) _t="";; + *) _t="-${CT_CLOOG_VERSION}";; + esac + CT_Pushd "${CT_SRC_DIR}/cloog-ppl${_t}" CT_Patch "cloog-ppl-${CT_CLOOG_VERSION}" nochdir CT_Popd } diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index 245cda8..340a02f 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -54,7 +54,7 @@ do_libc_get() { -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" \ + -a "${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 diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in index 4ef71ce..9e4e358 100644 --- a/scripts/saveSample.sh.in +++ b/scripts/saveSample.sh.in @@ -69,7 +69,7 @@ samp_dir="samples/${samp_name}" mkdir -p "${samp_dir}" # Save the crosstool-NG config file -"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${samp_name}"|;' \ +"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;' \ -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;' \ -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \ -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;' \ |