diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/building.py | 2 | ||||
| -rw-r--r-- | tools/cmake.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/building.py b/tools/building.py index 68e70ad6a6..5cf0935474 100644 --- a/tools/building.py +++ b/tools/building.py @@ -287,7 +287,7 @@ 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' or rtconfig.PLATFORM == 'armclang': + if rtconfig.PLATFORM in ['armcc', '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') diff --git a/tools/cmake.py b/tools/cmake.py index 02229556a1..eb89067914 100644 --- a/tools/cmake.py +++ b/tools/cmake.py @@ -29,7 +29,7 @@ def GenerateCFiles(env,project): 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('\\', "/") - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: FROMELF = os.path.join(rtconfig.EXEC_PATH, 'fromelf').replace('\\', "/") CFLAGS = rtconfig.CFLAGS.replace('\\', "/").replace('\"', "\\\"") @@ -51,7 +51,7 @@ def GenerateCFiles(env,project): SIZE += ".exe" OBJDUMP += ".exe" OBJCOPY += ".exe" - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: FROMELF += ".exe" if not os.path.exists(CC) or not os.path.exists(AS) or not os.path.exists(AR) or not os.path.exists(LINK): @@ -80,14 +80,14 @@ def GenerateCFiles(env,project): if rtconfig.PLATFORM == 'gcc': cm_file.write("SET(CMAKE_OBJCOPY \""+ OBJCOPY + "\")\n") cm_file.write("SET(CMAKE_SIZE \""+ SIZE + "\")\n\n") - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: cm_file.write("SET(CMAKE_FROMELF \""+ FROMELF + "\")\n\n") LINKER_FLAGS = '' LINKER_LIBS = '' if rtconfig.PLATFORM == 'gcc': LINKER_FLAGS += '-T' - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: LINKER_FLAGS += '--scatter' for group in project: if 'LIBPATH' in group.keys(): @@ -142,7 +142,7 @@ def GenerateCFiles(env,project): cm_file.write("ADD_EXECUTABLE(${CMAKE_PROJECT_NAME}.elf ${PROJECT_SOURCES})\n") cm_file.write("ADD_CUSTOM_COMMAND(TARGET ${CMAKE_PROJECT_NAME}.elf POST_BUILD \nCOMMAND ${CMAKE_OBJCOPY} -O binary ${CMAKE_PROJECT_NAME}.elf ${CMAKE_PROJECT_NAME}.bin COMMAND ${CMAKE_SIZE} ${CMAKE_PROJECT_NAME}.elf)") - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: cm_file.write("ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} ${PROJECT_SOURCES})\n") cm_file.write("ADD_CUSTOM_COMMAND(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD \nCOMMAND ${CMAKE_FROMELF} --bin ${CMAKE_PROJECT_NAME}.elf --output ${CMAKE_PROJECT_NAME}.bin COMMAND ${CMAKE_FROMELF} -z ${CMAKE_PROJECT_NAME}.elf)") |