From 83b3aadaa30f60fe011bf05f9212e2f583183d10 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 30 May 2022 18:11:15 -0400 Subject: [Scons][iar][iccarm] IAR统一使用iccarm作为判断条件而不是是用IDE的名字来进行判断 因为不确定后续IAR是否会像Keil一样内含有不同的编译工具链 此外,将判断条件改为列表方式,这样更方便后续增加其他可能的IAR编译链 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/xplorer4330/Libraries/Device/SConscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bsp/xplorer4330/Libraries/Device/SConscript') diff --git a/bsp/xplorer4330/Libraries/Device/SConscript b/bsp/xplorer4330/Libraries/Device/SConscript index da99bf9cc8..8084ff93ff 100644 --- a/bsp/xplorer4330/Libraries/Device/SConscript +++ b/bsp/xplorer4330/Libraries/Device/SConscript @@ -16,14 +16,14 @@ if rtconfig.USE_CORE =='CORE_M4': src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx.s'] - elif rtconfig.CROSS_TOOL == 'iar': + elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx.s'] else: if rtconfig.PLATFORM in ['gcc']: src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx_M0.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx_M0.s'] - elif rtconfig.CROSS_TOOL == 'iar': + elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx_M0.s'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) -- cgit v1.3.1