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 --- components/libc/compilers/common/SConscript | 2 +- components/libc/compilers/dlib/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'components/libc/compilers') diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index cf57f2abc3..1a341f5ad1 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -9,7 +9,7 @@ CPPDEFINES = [] if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES += ['__CLK_TCK=RT_TICK_PER_SECOND'] -elif rtconfig.PLATFORM == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: CPPDEFINES += ['CLOCKS_PER_SEC=RT_TICK_PER_SECOND'] # forcly revert to 1 by IAR src += Glob('*.c') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 2de512a03f..9c1c8a8ba2 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -6,7 +6,7 @@ group = [] CPPDEFINES = ['RT_USING_DLIBC', 'RT_USING_LIBC', '_DLIB_ADD_EXTRA_SYMBOLS=0'] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: if GetDepend('DFS_USING_POSIX'): from distutils.version import LooseVersion from iar import IARVersion -- cgit v1.3.1