Skip to content

[tools] fix the issue of cc detection failure in Windows #8914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 1 commit into from
May 8, 2024
Merged

[tools] fix the issue of cc detection failure in Windows #8914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/building.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ 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(os.path.join(rtconfig.EXEC_PATH, rtconfig.CC)):
if not utils.CmdExists(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']
Expand Down
20 changes: 20 additions & 0 deletions tools/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,23 @@ def VerTuple(version_str):
ver = tuple(int(part) for part in ver_parts)

return ver

def CmdExists(cmd):
import platform

cmd_list = cmd.split(' ')
cmd = cmd_list[0]
if os.path.isfile(cmd):
return True
else:
# check cmd(.exe|.bat|.ps1) under Windows
if platform.system() == 'Windows':
if cmd.find('exe') != -1 or cmd.find('bat') != -1 or cmd.find('ps1') != -1:
return False

# add .exe then check whether the cmd exists
cmd = cmd + '.exe'
if os.path.isfile(cmd):
return True

return False