ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-04-24 04:55:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

complibs: better deduce whether to backup complibs or not

Browse Source 
To decide whether we need to backup the companion libraries,
do not rely on the !shared case. In the future other cases
may require not to save the companion libraries (eg. if using
the ones provided by the host distro).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
This commit is contained in:
Yann E. MORIN" 2010-10-03 23:10:46 +02:00
parent ddac60504f
commit cb1a6420e9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/companion_libs.in
View File

@ -73,6 +73,11 @@ if COMPLIBS
comment "Companion libraries common options"
config COMPLIBS_BACKUP
bool
default y
depends on ! COMPLIBS_SHARED
config COMPLIBS_CHECK
bool
prompt "Check the companion libraries builds (!!! READ HELP!!!)"

8
scripts/functions
View File

@ -1017,9 +1017,7 @@ CT_DoSaveState() {
/^(UID|EUID)=/d;
/^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
# If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
# so do not save.
if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
CT_DoTarballIfExists "${CT_COMPLIBS_DIR}" "${state_dir}/complibs_dir"
fi
CT_DoTarballIfExists "${CT_CONFIG_DIR}" "${state_dir}/config_dir"
@ -1060,9 +1058,7 @@ CT_DoLoadState(){
CT_DoExtractTarballIfExists "${state_dir}/cc_core_shared_prefix_dir" "${CT_CC_CORE_SHARED_PREFIX_DIR}"
CT_DoExtractTarballIfExists "${state_dir}/cc_core_static_prefix_dir" "${CT_CC_CORE_STATIC_PREFIX_DIR}"
CT_DoExtractTarballIfExists "${state_dir}/config_dir" "${CT_CONFIG_DIR}"
if [ "${CT_COMPLIBS_SHARED}" != "y" ]; then
# If complibs are not shared, then COMPLIBS_DIR == PREFIX_DIR,
# so do not restore.
if [ "${CT_COMPLIBS_BACKUP}" = "y" ]; then
CT_DoExtractTarballIfExists "${state_dir}/complibs_dir" "${CT_COMPLIBS_DIR}"
fi