Skip to content
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

[tools] Add sdk_cfg.json setting for env CC detection #9890

Merged
merged 11 commits into from
Jan 12, 2025
Merged

[tools] Add sdk_cfg.json setting for env CC detection #9890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b12284e
[tools] fix the SDK path issue in env script.
BernardXiong Aug 28, 2024
9c3b874
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Sep 4, 2024
3d949d0
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Sep 8, 2024
79fafcc
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Sep 16, 2024
33ab629
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Sep 26, 2024
eb79397
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Nov 10, 2024
c03047a
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Dec 29, 2024
aeea4ae
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Jan 7, 2025
f996218
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Jan 8, 2025
09281c5
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
BernardXiong Jan 9, 2025
395b16c
[tools] Add sdk_cfg.json setting for CC detection.
BernardXiong Jan 9, 2025
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
19 changes: 10 additions & 9 deletions tools/building.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,16 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
envm = utils.ImportModule('env_utility')
# 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):
Env['log'].debug('set CC to ' + exec_path)
rtconfig.EXEC_PATH = exec_path
os.environ['RTT_EXEC_PATH'] = exec_path
else:
Env['log'].debug('No Toolchain found in path(%s).' % exec_path)
if exec_path != None:
if 'gcc' in rtconfig.CC:
exec_path = os.path.join(exec_path, 'bin')

if os.path.exists(exec_path):
Env['log'].debug('set CC to ' + exec_path)
rtconfig.EXEC_PATH = exec_path
os.environ['RTT_EXEC_PATH'] = exec_path
else:
Env['log'].debug('No Toolchain found in path(%s).' % exec_path)
except Exception as e:
# detect failed, ignore
Env['log'].debug(e)
Expand Down
12 changes: 11 additions & 1 deletion tools/env_utility.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,15 @@ def GetSDKPath(name):
sdk_pkgs = GetSDKPackagePath()

if sdk_pkgs:
# read env/tools/scripts/sdk_cfg.json for curstomized SDK path
if os.path.exists(os.path.join(sdk_pkgs, '..', 'sdk_cfg.json')):
with open(os.path.join(sdk_pkgs, '..', 'sdk_cfg.json'), 'r', encoding='utf-8') as f:
sdk_cfg = json.load(f)
for item in sdk_cfg:
if item['name'] == name:
sdk = os.path.join(sdk_pkgs, item['path'])
return sdk

# read packages.json under env/tools/scripts/packages
with open(os.path.join(sdk_pkgs, 'pkgs.json'), 'r', encoding='utf-8') as f:
# packages_json = f.read()
Expand All @@ -68,7 +77,8 @@ def GetSDKPath(name):
package = json.load(f)

if package['name'] == name:
return os.path.join(sdk_pkgs, package['name'] + '-' + item['ver'])
sdk = os.path.join(sdk_pkgs, package['name'] + '-' + item['ver'])
return sdk

# not found named package
return None
Expand Down
Loading