diff options
| author | Meco Man <[email protected]> | 2022-05-30 18:11:15 -0400 |
|---|---|---|
| committer | guo <[email protected]> | 2022-06-09 07:01:59 +0800 |
| commit | 83b3aadaa30f60fe011bf05f9212e2f583183d10 (patch) | |
| tree | 2c71de66189a2d5edb283c3ecdd8443c3057039c /bsp/microchip/same54 | |
| parent | 50f041f5c2fb69b06283f54ce4619a08751d9367 (diff) | |
[Scons][iar][iccarm] IAR统一使用iccarm作为判断条件而不是是用IDE的名字来进行判断
因为不确定后续IAR是否会像Keil一样内含有不同的编译工具链
此外，将判断条件改为列表方式，这样更方便后续增加其他可能的IAR编译链
Diffstat (limited to 'bsp/microchip/same54')
| -rw-r--r-- | bsp/microchip/same54/SConstruct | 2 | ||||
| -rw-r--r-- | bsp/microchip/same54/bsp/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bsp/microchip/same54/SConstruct b/bsp/microchip/same54/SConstruct index 9f8b13d9cf..1a7569d7b8 100644 --- a/bsp/microchip/same54/SConstruct +++ b/bsp/microchip/same54/SConstruct @@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'], LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread-'+ rtconfig.DEVICE_PART + '.map') diff --git a/bsp/microchip/same54/bsp/SConscript b/bsp/microchip/same54/bsp/SConscript index e2e8067592..579242efa8 100644 --- a/bsp/microchip/same54/bsp/SConscript +++ b/bsp/microchip/same54/bsp/SConscript @@ -41,7 +41,7 @@ if rtconfig.PLATFORM in ['gcc']: elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/armcc/arm_addon/armcc/' + 'system_same54.c'] src += [cwd + '/armcc/arm_addon/armcc/arm/' + 'startup_same54.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/iar/' + 'system_same54.c'] src += [cwd + '/iar/iar/' + 'startup_same54.c'] |