diff options
Diffstat (limited to 'scripts/functions')
| -rw-r--r-- | scripts/functions | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/scripts/functions b/scripts/functions index 94fd1e9e..cd15f39b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -25,6 +25,7 @@ CT_LoadConfig() { . "${CT_LIB_DIR}/scripts/build/binutils/${CT_BINUTILS}.sh" . "${CT_LIB_DIR}/scripts/build/libc.sh" . "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh" + . "${CT_LIB_DIR}/scripts/build/linker.sh" . "${CT_LIB_DIR}/scripts/build/debug.sh" . "${CT_LIB_DIR}/scripts/build/test_suite.sh" @@ -956,6 +957,7 @@ CT_GetFile() # Do we already have it in *our* tarballs dir? if [ -r "${CT_TARBALLS_DIR}/${basename}${ext}" ]; then CT_DoLog DEBUG "Already have '${CT_TARBALLS_DIR}/${basename}${ext}'" + touch "${CT_TARBALLS_DIR}/${basename}${ext}" # for CI return 0 fi @@ -1778,6 +1780,7 @@ CT_Mirrors() case "${org}" in GNU) + echo "https://mirrors.tuna.tsinghua.edu.cn/gnu/${project}" echo "https://ftpmirror.gnu.org/gnu/${project}" echo "http://ftpmirror.gnu.org/gnu/${project}" echo "https://ftp.gnu.org/gnu/${project}" @@ -1785,9 +1788,10 @@ CT_Mirrors() echo "ftp://ftp.gnu.org/gnu/${project}" ;; sourceware) + echo "https://sourceware.org/${project}/ftp" echo "ftp://sourceware.org/pub/${project}" - echo "http://mirrors.kernel.org/sourceware/${project}" - echo "http://gcc.gnu.org/pub/${project}" + echo "https://mirrors.kernel.org/sourceware/${project}" + echo "https://gcc.gnu.org/pub/${project}" ;; Linaro) local version="${3}" @@ -2502,7 +2506,7 @@ if [ -r "${CT_LIB_DIR}/paths.sh" ]; then elif [ -r "${CT_TOP_DIR}/paths.sh" ]; then paths_sh_location="${CT_TOP_DIR}/paths.sh" else - CT_Error "Not found: paths.sh" + CT_Abort "Not found: paths.sh" fi . "${paths_sh_location}" @@ -2536,8 +2540,7 @@ CT_InstallConfigurationFile() local path="${1}" local suffix="${2}" - CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin" - CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" - CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" - bzip2 -c -9 "${path}" >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-${suffix}.config" + CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/share" + CT_DoExecLog DEBUG ${install} -m 0644 "${path}" "${CT_PREFIX_DIR}/share/${CT_TARGET}-${suffix}.config" + CT_DoExecLog DEBUG bzip2 -9 "${CT_PREFIX_DIR}/share/${CT_TARGET}-${suffix}.config" } |