From dd94198bd6acaaf03324774fe415df3ca379d1f5 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Mon, 15 Aug 2022 10:32:27 -0400
Subject: [gcc][armcc][armclang] rtconfig.CROSS_TOOL->rtconfig.PLATFORM

---
 components/drivers/spi/SConscript    |  6 ++----
 components/libc/cplusplus/SConscript | 16 +++++++---------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'components')

diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript
index 8fe82b73e4..27b7a8dd71 100644
--- a/components/drivers/spi/SConscript
+++ b/components/drivers/spi/SConscript
@@ -29,12 +29,10 @@ if GetDepend('RT_USING_SFUD'):
     if GetDepend('RT_SFUD_USING_SFDP'):
         src_device += ['sfud/src/sfud_sfdp.c']
 
-    if rtconfig.PLATFORM in ['gcc']:
+    if rtconfig.PLATFORM in ['gcc', 'armclang']:
         LOCAL_CFLAGS += ' -std=c99'
-    elif rtconfig.PLATFORM == 'armcc':
+    elif rtconfig.PLATFORM in ['armcc']:
         LOCAL_CFLAGS += ' --c99'
-    elif rtconfig.PLATFORM == 'armclang':
-        LOCAL_CFLAGS += ' -std=c99'
 
 src += src_device
 
diff --git a/components/libc/cplusplus/SConscript b/components/libc/cplusplus/SConscript
index 82983fa667..1c764ea3e3 100644
--- a/components/libc/cplusplus/SConscript
+++ b/components/libc/cplusplus/SConscript
@@ -5,18 +5,16 @@ Import('rtconfig')
 
 cwd = GetCurrentDir()
 src = Glob('*.cpp') + Glob('*.c')
+CPPPATH = [cwd]
 
 if GetDepend('RT_USING_CPLUSPLUS11'):
     src += Glob('cpp11/*.cpp') + Glob('cpp11/*.c')
-
-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 in ['gcc'] and GetDepend('RT_USING_CPLUSPLUS11'):
-    src += Glob('cpp11/gcc/*.cpp') + Glob('cpp11/gcc/*.c')
-    CPPPATH += [cwd + '/cpp11/gcc']
+    if rtconfig.PLATFORM in ['armclang']:
+        src += Glob('cpp11/armclang/*.cpp') + Glob('cpp11/armclang/*.c')
+        CPPPATH += [cwd + '/cpp11/armclang']
+    elif rtconfig.PLATFORM in ['gcc']:
+        src += Glob('cpp11/gcc/*.cpp') + Glob('cpp11/gcc/*.c')
+        CPPPATH += [cwd + '/cpp11/gcc']
 
 group = DefineGroup('CPlusPlus', src, depend = ['RT_USING_CPLUSPLUS'], CPPPATH = CPPPATH)
 
-- 
cgit v1.3.1