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

Merge pull request #1128 from dimkr/uclibc-cfg

Browse Source 
Store the uClibc .config alongside the ct-ng .config
This commit is contained in:
Alexey Neyman 2019-01-22 23:57:17 -08:00 committed by GitHub
commit daa0752950
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build/libc/uClibc.sh
View File

@ -416,4 +416,8 @@ uClibc_post_cc()
# Moreover, need to do this after the final compiler is built: on targets # Moreover, need to do this after the final compiler is built: on targets
# that use elf2flt, the core compilers cannot find ld when running elf2flt. # that use elf2flt, the core compilers cannot find ld when running elf2flt.
CT_MultilibFixupLDSO CT_MultilibFixupLDSO
if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
CT_InstallConfigurationFile "${CT_LIBC_UCLIBC_CONFIG_FILE}" libc
fi
} }

5
scripts/crosstool-NG.sh
View File

@ -613,10 +613,7 @@ if [ -z "${CT_RESTART}" ]; then
rm -f "${testc}" rm -f "${testc}"
CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration" CT_DoLog EXTRA "Installing user-supplied crosstool-NG configuration"
CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/bin" CT_InstallConfigurationFile .config ct-ng
CT_DoExecLog DEBUG ${install} -m 0755 "${CT_LIB_DIR}/scripts/toolchain-config.in" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
CT_DoExecLog DEBUG ${sed} -i -e 's,@@grep@@,"'"${grep}"'",;' "${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
bzip2 -c -9 .config >>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-ct-ng.config"
CT_DoStep EXTRA "Dumping internal crosstool-NG configuration" CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"
CT_DoLog EXTRA "Building a toolchain for:" CT_DoLog EXTRA "Building a toolchain for:"

11
scripts/functions
View File

@ -2453,3 +2453,14 @@ CT_InstallCopyingInformation()
shopt -u nullglob shopt -u nullglob
} }
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"
}