mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-19 12:57:53 +00:00
Re-enable the restart functionality by removing some variables from the saved environment.
/trunk/scripts/functions | 16 10 6 0 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
This commit is contained in:
parent
66e2db8dad
commit
8e512f9a95
@ -636,13 +636,17 @@ CT_DoSaveState() {
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
CT_DoLog DEBUG " Saving environment and aliases"
|
CT_DoLog DEBUG " Saving environment and aliases"
|
||||||
# We must omit shell functions
|
# We must omit shell functions, and some specific bash variables
|
||||||
|
# that break when restoring the environment, later. We could do
|
||||||
|
# all the processing in the awk script, but a sed is easier...
|
||||||
set |awk '
|
set |awk '
|
||||||
BEGIN { _p = 1; }
|
BEGIN { _p = 1; }
|
||||||
$0~/^[^ ]+ \(\)/ { _p = 0; }
|
$0~/^[^ ]+ \(\)/ { _p = 0; }
|
||||||
_p == 1
|
_p == 1
|
||||||
$0 == "}" { _p = 1; }
|
$0 == "}" { _p = 1; }
|
||||||
' >"${state_dir}/env.sh"
|
' |sed -r -e '/^BASH_(ARGC|ARGV|LINENO|SOURCE|VERSINFO)=/d;
|
||||||
|
/^(UID|EUID)=/d;
|
||||||
|
/^(FUNCNAME|GROUPS|PPID|SHELLOPTS)=/d;' >"${state_dir}/env.sh"
|
||||||
|
|
||||||
CT_DoLog DEBUG " Saving CT_CC_CORE_STATIC_PREFIX_DIR='${CT_CC_CORE_STATIC_PREFIX_DIR}'"
|
CT_DoLog DEBUG " Saving CT_CC_CORE_STATIC_PREFIX_DIR='${CT_CC_CORE_STATIC_PREFIX_DIR}'"
|
||||||
CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
|
CT_Pushd "${CT_CC_CORE_STATIC_PREFIX_DIR}"
|
||||||
|
Loading…
Reference in New Issue
Block a user