diff options
| author | Meco Man <[email protected]> | 2022-05-30 18:04:05 -0400 |
|---|---|---|
| committer | guo <[email protected]> | 2022-06-09 07:01:59 +0800 |
| commit | 50f041f5c2fb69b06283f54ce4619a08751d9367 (patch) | |
| tree | 7e21367cb788808018dd4ccf5eee70a8ac2c8d0f /components | |
| parent | e622ef3aec4fe36d6348a3e746823dadc213979b (diff) | |
[Scons] 将GCC判断条件改为列表方式，方便后续增加新的编译工具链
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/spi/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/compilers/newlib/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/cplusplus/SConscript | 2 | ||||
| -rw-r--r-- | components/libc/posix/libdl/SConscript | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript index b409f1196c..8fe82b73e4 100644 --- a/components/drivers/spi/SConscript +++ b/components/drivers/spi/SConscript @@ -29,7 +29,7 @@ if GetDepend('RT_USING_SFUD'): if GetDepend('RT_SFUD_USING_SFDP'): src_device += ['sfud/src/sfud_sfdp.c'] - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: LOCAL_CFLAGS += ' -std=c99' elif rtconfig.PLATFORM == 'armcc': LOCAL_CFLAGS += ' --c99' diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index b1d4a53eb1..ab2d3517e2 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -9,7 +9,7 @@ group = [] LIBS = [] CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: LIBS += ['c', 'm'] # link libc and libm src += Glob('*.c') diff --git a/components/libc/cplusplus/SConscript b/components/libc/cplusplus/SConscript index 325a27f65f..82983fa667 100644 --- a/components/libc/cplusplus/SConscript +++ b/components/libc/cplusplus/SConscript @@ -14,7 +14,7 @@ CPPPATH = [cwd] if rtconfig.PLATFORM == 'armclang' and GetDepend('RT_USING_CPLUSPLUS11'): src += Glob('cpp11/armclang/*.cpp') + Glob('cpp11/armclang/*.c') CPPPATH += [cwd + '/cpp11/armclang'] -elif rtconfig.PLATFORM == 'gcc' and GetDepend('RT_USING_CPLUSPLUS11'): +elif rtconfig.PLATFORM in ['gcc'] and GetDepend('RT_USING_CPLUSPLUS11'): src += Glob('cpp11/gcc/*.cpp') + Glob('cpp11/gcc/*.c') CPPPATH += [cwd + '/cpp11/gcc'] diff --git a/components/libc/posix/libdl/SConscript b/components/libc/posix/libdl/SConscript index 7c5f9b8085..146253909f 100644 --- a/components/libc/posix/libdl/SConscript +++ b/components/libc/posix/libdl/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() group = [] CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: group = DefineGroup('POSIX', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) Return('group') |