[tools] fix EXEC_PATH exists, but the CC does not.
This commit is contained in:
parent
b76dca8f4f
commit
582d11faad
|
@ -195,23 +195,23 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
|
|||
os.environ['RTT_CC_PREFIX'] = exec_prefix
|
||||
|
||||
# auto change the 'RTT_EXEC_PATH' when 'rtconfig.EXEC_PATH' get failed
|
||||
if not os.path.exists(rtconfig.EXEC_PATH):
|
||||
if not os.path.exists(os.path.join(rtconfig.EXEC_PATH, rtconfig.CC)):
|
||||
if 'RTT_EXEC_PATH' in os.environ:
|
||||
# del the 'RTT_EXEC_PATH' and using the 'EXEC_PATH' setting on rtconfig.py
|
||||
del os.environ['RTT_EXEC_PATH']
|
||||
|
||||
try:
|
||||
# try to detect toolchains in env
|
||||
from utils import ImportModule
|
||||
envm = ImportModule('env')
|
||||
envm = utils.ImportModule('env')
|
||||
# from env import GetSDKPath
|
||||
exec_path = envm.GetSDKPath(rtconfig.CC)
|
||||
if 'gcc' in rtconfig.CC:
|
||||
exec_path = os.path.join(exec_path, 'bin')
|
||||
if os.path.exists(exec_path):
|
||||
print('set CC to ' + exec_path)
|
||||
rtconfig.EXEC_PATH = exec_path
|
||||
os.environ['RTT_EXEC_PATH'] = exec_path
|
||||
|
||||
if os.path.exists(exec_path):
|
||||
print('set CC to ' + exec_path)
|
||||
rtconfig.EXEC_PATH = exec_path
|
||||
os.environ['RTT_EXEC_PATH'] = exec_path
|
||||
except Exception as e:
|
||||
# detect failed, ignore
|
||||
pass
|
||||
|
|
Loading…
Reference in New Issue