diff options
| author | Bernard Xiong <[email protected]> | 2019-09-15 09:32:26 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-15 09:32:26 +0800 |
| commit | f827df0e51c5f133f9d44e3231be625e5b98ca04 (patch) | |
| tree | bd322dec7119b875f75687bec8e05a1550c74498 | |
| parent | d7addb66e0a9f498275aaa6ce4add91236e25b92 (diff) | |
| parent | ca67b4d18e90a1e3bd45497267121555bc830a2d (diff) | |
Merge pull request #3073 from liruncong/armclang
[tools]armclang库文件编译支持
| -rw-r--r-- | tools/building.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/building.py b/tools/building.py index f19b76d0e3..3b593b4960 100644 --- a/tools/building.py +++ b/tools/building.py @@ -281,8 +281,8 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ utils.ReloadModule(rtconfig) # add compability with Keil MDK 4.6 which changes the directory of armcc.exe - if rtconfig.PLATFORM == 'armcc': - if not os.path.isfile(os.path.join(rtconfig.EXEC_PATH, 'armcc.exe')): + if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': + if rtconfig.PLATFORM == 'armcc' and not os.path.isfile(os.path.join(rtconfig.EXEC_PATH, 'armcc.exe')): if rtconfig.EXEC_PATH.find('bin40') > 0: rtconfig.EXEC_PATH = rtconfig.EXEC_PATH.replace('bin40', 'armcc/bin') Env['LINKFLAGS'] = Env['LINKFLAGS'].replace('RV31', 'armcc') |