mirror of
https://github.com/DarkFlippers/unleashed-firmware
synced 2024-11-22 04:23:09 +00:00
fbt: moved FBT_NOEVN check to env setup script for *nix
This commit is contained in:
parent
d731918197
commit
bc98c788fe
2 changed files with 12 additions and 4 deletions
3
fbt
3
fbt
|
@ -12,15 +12,12 @@ SCONS_DEFAULT_FLAGS="--warn=target-not-built";
|
|||
SCONS_EP="python3 -m SCons";
|
||||
|
||||
# public variables
|
||||
FBT_NOENV="${FBT_NOENV:-""}";
|
||||
FBT_NO_SYNC="${FBT_NO_SYNC:-""}";
|
||||
FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
|
||||
FBT_VERBOSE="${FBT_VERBOSE:-""}";
|
||||
FBT_GIT_SUBMODULE_SHALLOW="${FBT_GIT_SUBMODULE_SHALLOW:-""}";
|
||||
|
||||
if [ -z "$FBT_NOENV" ]; then
|
||||
FBT_VERBOSE="$FBT_VERBOSE" . "$SCRIPT_PATH/scripts/toolchain/fbtenv.sh";
|
||||
fi
|
||||
|
||||
if [ -z "$FBT_VERBOSE" ]; then
|
||||
SCONS_DEFAULT_FLAGS="$SCONS_DEFAULT_FLAGS -Q";
|
||||
|
|
|
@ -76,6 +76,14 @@ fbtenv_restore_env()
|
|||
unset FBT_TOOLCHAIN_PATH;
|
||||
}
|
||||
|
||||
fbtenv_check_if_noenv_set()
|
||||
{
|
||||
if [ -n "${FBT_NOENV:-""}" ]; then
|
||||
return 1;
|
||||
fi
|
||||
return 0;
|
||||
}
|
||||
|
||||
fbtenv_check_sourced()
|
||||
{
|
||||
if [ -n "${FBT_SKIP_CHECK_SOURCED:-""}" ]; then
|
||||
|
@ -298,6 +306,9 @@ fbtenv_print_config()
|
|||
|
||||
fbtenv_main()
|
||||
{
|
||||
if ! fbtenv_check_if_noenv_set; then
|
||||
return 0;
|
||||
fi
|
||||
fbtenv_check_sourced || return 1;
|
||||
fbtenv_get_kernel_type || return 1;
|
||||
if [ "$1" = "--restore" ]; then
|
||||
|
|
Loading…
Reference in a new issue