diff --git a/cmds/cmd_menuconfig.py b/cmds/cmd_menuconfig.py index 348be4e..96efc1c 100644 --- a/cmds/cmd_menuconfig.py +++ b/cmds/cmd_menuconfig.py @@ -190,9 +190,11 @@ def cmd(args): env_root = Import('env_root') - # get RTT_DIR from environment or Kconfig file - if get_rtt_root(): - os.environ['RTT_DIR'] = get_rtt_root() + # Keep both legacy Kconfig symbol names and their environment variables set. + rtt_root = get_rtt_root() + if rtt_root: + os.environ['RTT_ROOT'] = rtt_root + os.environ['RTT_DIR'] = rtt_root if not os.path.exists('Kconfig'): if platform.system() == "Windows": diff --git a/env.py b/env.py index d240476..5b3e2bf 100644 --- a/env.py +++ b/env.py @@ -198,6 +198,7 @@ def export_environment_variable(): os.environ["ENV_ROOT"] = env_root os.environ['PKGS_ROOT'] = pkgs_root os.environ['PKGS_DIR'] = pkgs_root + os.environ['BSP_ROOT'] = bsp_root os.environ['BSP_DIR'] = bsp_root Export('env_root')