diff options
| author | Meco Man <[email protected]> | 2022-08-15 10:32:27 -0400 |
|---|---|---|
| committer | guo <[email protected]> | 2022-08-16 09:39:00 +0800 |
| commit | dd94198bd6acaaf03324774fe415df3ca379d1f5 (patch) | |
| tree | 19a6dabb882c4be18290d0a3efea95c763ce987f /tools | |
| parent | c038e55d32362d52ffb35e20d4b05c445c35f3ce (diff) | |
[gcc][armcc][armclang] rtconfig.CROSS_TOOL->rtconfig.PLATFORM
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/building.py | 10 | ||||
| -rw-r--r-- | tools/cmake.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tools/building.py b/tools/building.py index 5526b84e05..91c6d05c99 100644 --- a/tools/building.py +++ b/tools/building.py @@ -124,7 +124,7 @@ class Win32Spawn: # generate cconfig.h file def GenCconfigFile(env, BuildOptions): - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: contents = '' if not os.path.isfile('cconfig.h'): import gcc @@ -287,7 +287,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ GenCconfigFile(env, BuildOptions) # auto append '_REENT_SMALL' when using newlib 'nano.specs' option - if rtconfig.PLATFORM == 'gcc' and str(env['LINKFLAGS']).find('nano.specs') != -1: + if rtconfig.PLATFORM in ['gcc'] and str(env['LINKFLAGS']).find('nano.specs') != -1: env.AppendUnique(CPPDEFINES = ['_REENT_SMALL']) if GetOption('genconfig'): @@ -618,7 +618,7 @@ def DefineGroup(name, src, depend, **parameters): group['LOCAL_CPPPATH'] = paths - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: if 'CFLAGS' in group: group['CFLAGS'] = utils.GCCC99Patch(group['CFLAGS']) if 'CCFLAGS' in group: @@ -695,9 +695,9 @@ def PreBuilding(): def GroupLibName(name, env): - if rtconfig.PLATFORM == 'armcc': + if rtconfig.PLATFORM in ['armcc']: return name + '_rvds' - elif rtconfig.PLATFORM == 'gcc': + elif rtconfig.PLATFORM in ['gcc']: return name + '_gcc' return name diff --git a/tools/cmake.py b/tools/cmake.py index 2129c2d612..d938f9c787 100644 --- a/tools/cmake.py +++ b/tools/cmake.py @@ -25,7 +25,7 @@ def GenerateCFiles(env,project): AS = os.path.join(rtconfig.EXEC_PATH, rtconfig.AS).replace('\\', "/") AR = os.path.join(rtconfig.EXEC_PATH, rtconfig.AR).replace('\\', "/") LINK = os.path.join(rtconfig.EXEC_PATH, rtconfig.LINK).replace('\\', "/") - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: SIZE = os.path.join(rtconfig.EXEC_PATH, rtconfig.SIZE).replace('\\', "/") OBJDUMP = os.path.join(rtconfig.EXEC_PATH, rtconfig.OBJDUMP).replace('\\', "/") OBJCOPY = os.path.join(rtconfig.EXEC_PATH, rtconfig.OBJCPY).replace('\\', "/") @@ -47,7 +47,7 @@ def GenerateCFiles(env,project): AS += ".exe" AR += ".exe" LINK += ".exe" - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: SIZE += ".exe" OBJDUMP += ".exe" OBJCOPY += ".exe" @@ -78,7 +78,7 @@ def GenerateCFiles(env,project): cm_file.write("SET(CMAKE_CXX_FLAGS \""+ CXXFLAGS + "\")\n") cm_file.write("SET(CMAKE_CXX_COMPILER_WORKS TRUE)\n\n") - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: cm_file.write("SET(CMAKE_OBJCOPY \""+ OBJCOPY + "\")\n") cm_file.write("SET(CMAKE_SIZE \""+ SIZE + "\")\n\n") elif rtconfig.PLATFORM in ['armcc', 'armclang']: @@ -86,7 +86,7 @@ def GenerateCFiles(env,project): LINKER_FLAGS = '' LINKER_LIBS = '' - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: LINKER_FLAGS += '-T' elif rtconfig.PLATFORM in ['armcc', 'armclang']: LINKER_FLAGS += '--scatter' @@ -126,7 +126,7 @@ def GenerateCFiles(env,project): cm_file.write( "\t" + path.replace("\\", "/") + "\n" ) cm_file.write(")\n\n") - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: cm_file.write("LINK_DIRECTORIES(\n") for group in project: if 'LIBPATH' in group.keys(): |