[update] change ccflags to cflags

10 files changed, 58 insertions, 38 deletions

diff --git a/bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/SConscript b/bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/SConscript
index 3321a76d91..625f186203 100644
--- a/bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/SConscript
+++ b/bsp/bluetrum/libraries/hal_libraries/ab32vg1_hal/SConscript
@@ -18,12 +18,14 @@ DEPENDS = [""]
 # SOURCES: Need to compile c and c++ source, auto search when SOURCES is empty
 # 
 # LOCAL_CPPPATH: Local file path (.h/.c/.cpp)
-# LOCAL_CCFLAGS: Local compilation parameter 
+# LOCAL_CFLAGS: Local c compilation parameter
+# LOCAL_CCFLAGS: Local c/c++ compilation parameter 
+# LOCAL_CXXFLAGS: Local c++ compilation parameter 
 # LOCAL_ASFLAGS: Local assembly parameters
 # 
 # CPPPATH: Global file path (.h/.c/.cpp), auto search when LOCAL_CPPPATH/CPPPATH 
 #          is empty # no pass!!!
-# CCFLAGS: Global compilation parameter 
+# CFLAGS : Global compilation parameter 
 # ASFLAGS: Global assembly parameters
 #
 # CPPDEFINES: Global macro definition
@@ -37,12 +39,16 @@ DEPENDS = [""]
 CWD              = GetCurrentDir()
 SOURCES          = Glob("./source/*.c")
 
-LOCAL_CPPPATH    = [] 
-LOCAL_CCFLAGS    = "" 
+LOCAL_CPPPATH    = []
+LOCAL_CFLAGS     = ""
+LOCAL_CCFLAGS    = ""
+LOCAL_CXXFLAGS   = ""
 LOCAL_ASFLAGS    = ""
 
 CPPPATH          = [GetCurrentDir(), os.path.join(GetCurrentDir(), 'include')] 
-CCFLAGS          = "" 
+CFLAGS           = ""
+CCFLAGS          = ""
+CXXFLAGS          = ""
 ASFLAGS          = ""
 
 CPPDEFINES       = []
@@ -61,10 +67,14 @@ CPPPATH_IGNORE   = []
 #---------------------------------------------------------------------------------
 objs = DefineGroup(name = PKGNAME, src = SOURCES, depend = DEPENDS, 
                    CPPPATH          = CPPPATH, 
+                   CFLAGS           = CFLAGS, 
                    CCFLAGS          = CCFLAGS, 
+                   CXXFLAGS          = CXXFLAGS, 
                    ASFLAGS          = ASFLAGS, 
                    LOCAL_CPPPATH    = LOCAL_CPPPATH, 
+                   LOCAL_CFLAGS     = LOCAL_CFLAGS, 
                    LOCAL_CCFLAGS    = LOCAL_CCFLAGS, 
+                   LOCAL_CXXFLAGS   = LOCAL_CXXFLAGS, 
                    LOCAL_ASFLAGS    = LOCAL_ASFLAGS, 
                    CPPDEFINES       = CPPDEFINES, 
                    LOCAL_CPPDEFINES = LOCAL_CPPDEFINES, 
diff --git a/bsp/bluetrum/libraries/hal_libraries/bmsis/SConscript b/bsp/bluetrum/libraries/hal_libraries/bmsis/SConscript
index 9a82897032..a395e0acf8 100644
--- a/bsp/bluetrum/libraries/hal_libraries/bmsis/SConscript
+++ b/bsp/bluetrum/libraries/hal_libraries/bmsis/SConscript
@@ -19,12 +19,14 @@ DEPENDS = [""]
 # SOURCES: Need to compile c and c++ source, auto search when SOURCES is empty
 # 
 # LOCAL_CPPPATH: Local file path (.h/.c/.cpp)
-# LOCAL_CCFLAGS: Local compilation parameter 
+# LOCAL_CFLAGS: Local c compilation parameter
+# LOCAL_CCFLAGS: Local c/c++ compilation parameter 
+# LOCAL_CXXFLAGS: Local c++ compilation parameter 
 # LOCAL_ASFLAGS: Local assembly parameters
 # 
 # CPPPATH: Global file path (.h/.c/.cpp), auto search when LOCAL_CPPPATH/CPPPATH 
 #          is empty # no pass!!!
-# CCFLAGS: Global compilation parameter 
+# CFLAGS : Global compilation parameter 
 # ASFLAGS: Global assembly parameters
 #
 # CPPDEFINES: Global macro definition
@@ -35,22 +37,26 @@ DEPENDS = [""]
 #
 # LINKFLAGS: Link options
 #---------------------------------------------------------------------------------
+CWD              = GetCurrentDir()
 SOURCES          = Glob("./source/*.c")
-SOURCES          += Glob("./source/*.S")
 
-LOCAL_CPPPATH    = [] 
-LOCAL_CCFLAGS    = "" 
+LOCAL_CPPPATH    = []
+LOCAL_CFLAGS     = ""
+LOCAL_CCFLAGS    = ""
+LOCAL_CXXFLAGS   = ""
 LOCAL_ASFLAGS    = ""
 
 CPPPATH          = [GetCurrentDir(), os.path.join(GetCurrentDir(), 'include')] 
-CCFLAGS          = "" 
+CFLAGS           = ""
+CCFLAGS          = ""
+CXXFLAGS          = ""
 ASFLAGS          = ""
 
 CPPDEFINES       = []
 LOCAL_CPPDEFINES = []
 
 LIBS             = [] 
-LIBPATH          = [] 
+LIBPATH          = []
 
 LINKFLAGS        = "" 
 
@@ -62,10 +68,14 @@ CPPPATH_IGNORE   = []
 #---------------------------------------------------------------------------------
 objs = DefineGroup(name = PKGNAME, src = SOURCES, depend = DEPENDS, 
                    CPPPATH          = CPPPATH, 
+                   CFLAGS           = CFLAGS, 
                    CCFLAGS          = CCFLAGS, 
+                   CXXFLAGS          = CXXFLAGS, 
                    ASFLAGS          = ASFLAGS, 
                    LOCAL_CPPPATH    = LOCAL_CPPPATH, 
+                   LOCAL_CFLAGS     = LOCAL_CFLAGS, 
                    LOCAL_CCFLAGS    = LOCAL_CCFLAGS, 
+                   LOCAL_CXXFLAGS   = LOCAL_CXXFLAGS, 
                    LOCAL_ASFLAGS    = LOCAL_ASFLAGS, 
                    CPPDEFINES       = CPPDEFINES, 
                    LOCAL_CPPDEFINES = LOCAL_CPPDEFINES, 
diff --git a/bsp/ck802/applications/SConscript b/bsp/ck802/applications/SConscript
index 78698e4ad3..8cffec4949 100644
--- a/bsp/ck802/applications/SConscript
+++ b/bsp/ck802/applications/SConscript
@@ -6,8 +6,8 @@ cwd     = os.path.join(str(Dir('#')), 'applications')
 src	= Glob('*.c')
 CPPPATH = [cwd, str(Dir('#'))]
 
-CCFLAGS = ' -c -mistack -ffunction-sections'
+CFLAGS = ' -c -mistack -ffunction-sections'
 
-group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CCFLAGS=CCFLAGS)
+group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CFLAGS=CFLAGS)
 
 Return('group')
diff --git a/bsp/gd32/docs/GD32系列BSP制作教程.md b/bsp/gd32/docs/GD32系列BSP制作教程.md
index 6f0a4427f7..4e517348b5 100644
--- a/bsp/gd32/docs/GD32系列BSP制作教程.md
+++ b/bsp/gd32/docs/GD32系列BSP制作教程.md
@@ -145,14 +145,14 @@ TARGET = 'rtthread.' + rtconfig.TARGET_EXT
 DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
-    CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
 if rtconfig.PLATFORM == 'iar':
-    env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
+    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
 
diff --git a/bsp/ra6m4-cpk/ports/fal/SConscript b/bsp/ra6m4-cpk/ports/fal/SConscript
index 2b71fcc93c..c8931044c5 100644
--- a/bsp/ra6m4-cpk/ports/fal/SConscript
+++ b/bsp/ra6m4-cpk/ports/fal/SConscript
@@ -8,15 +8,15 @@ src = []
 
 src     += Glob('*.c')
 CPPPATH = [cwd]
-LOCAL_CCFLAGS = ''
+LOCAL_CFLAGS = ''
 
 if rtconfig.PLATFORM == 'gcc':
-    LOCAL_CCFLAGS += ' -std=c99'
+    LOCAL_CFLAGS += ' -std=c99'
 elif rtconfig.PLATFORM == 'armcc':
-    LOCAL_CCFLAGS += ' --c99'
+    LOCAL_CFLAGS += ' --c99'
 elif rtconfig.PLATFORM == 'armclang':
-    LOCAL_CCFLAGS += ' -std=c99'
+    LOCAL_CFLAGS += ' -std=c99'
 
-group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
+group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
 
 Return('group')
diff --git a/bsp/ra6m4-cpk/ports/rw007/SConscript b/bsp/ra6m4-cpk/ports/rw007/SConscript
index 7ce64a6c3c..99b97f1a80 100644
--- a/bsp/ra6m4-cpk/ports/rw007/SConscript
+++ b/bsp/ra6m4-cpk/ports/rw007/SConscript
@@ -8,15 +8,15 @@ src = []
 
 src     += Glob('*.c')
 CPPPATH = [cwd]
-LOCAL_CCFLAGS = ''
+LOCAL_CFLAGS = ''
 
 if rtconfig.PLATFORM == 'gcc':
-    LOCAL_CCFLAGS += ' -std=c99'
+    LOCAL_CFLAGS += ' -std=c99'
 elif rtconfig.PLATFORM == 'armcc':
-    LOCAL_CCFLAGS += ' --c99'
+    LOCAL_CFLAGS += ' --c99'
 elif rtconfig.PLATFORM == 'armclang':
-    LOCAL_CCFLAGS += ' -std=c99'
+    LOCAL_CFLAGS += ' -std=c99'
 
-group = DefineGroup('rw007', src, depend = ['BSP_USING_RW007'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
+group = DefineGroup('rw007', src, depend = ['BSP_USING_RW007'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
 
 Return('group')
diff --git a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct
index a7cc0cb251..7adb1878ab 100644
--- a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct
+++ b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct
@@ -20,14 +20,14 @@ TARGET = 'rt-thread.' + rtconfig.TARGET_EXT
 DefaultEnvironment(tools=[])
 env = Environment(tools = ['mingw'],
     AS = rtconfig.AS, ASFLAGS = rtconfig.AFLAGS,
-    CC = rtconfig.CC, CCFLAGS = rtconfig.CFLAGS,
+    CC = rtconfig.CC, CFLAGS = rtconfig.CFLAGS,
     AR = rtconfig.AR, ARFLAGS = '-rc',
     CXX = rtconfig.CXX, CXXFLAGS = rtconfig.CXXFLAGS,
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
 if rtconfig.PLATFORM == 'iar':
-    env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
+    env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
 
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
index 4a53bd1c97..045b8d91df 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
@@ -8,16 +8,16 @@ src = []
 
 src     += Glob('*.c')
 CPPPATH = [cwd]
-LOCAL_CCFLAGS = ''
+LOCAL_CFLAGS = ''
 
 if rtconfig.CROSS_TOOL == 'gcc':
-    LOCAL_CCFLAGS += ' -std=c99'
+    LOCAL_CFLAGS += ' -std=c99'
 elif rtconfig.CROSS_TOOL == 'keil':
     if rtconfig.PLATFORM == 'armcc':
-        LOCAL_CCFLAGS += ' --c99'
+        LOCAL_CFLAGS += ' --c99'
     elif rtconfig.PLATFORM == 'armclang':
-        LOCAL_CCFLAGS += ' -std=c99'
+        LOCAL_CFLAGS += ' -std=c99'
 
-group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
+group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
 
 Return('group')
diff --git a/bsp/thead-smart/applications/SConscript b/bsp/thead-smart/applications/SConscript
index b95023ca41..873f10c6e5 100644
--- a/bsp/thead-smart/applications/SConscript
+++ b/bsp/thead-smart/applications/SConscript
@@ -6,8 +6,8 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = GetCurrentDir()
 
-CCFLAGS = ' -c -ffunction-sections'
+CFLAGS = ' -c -ffunction-sections'
 
-group   = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CCFLAGS=CCFLAGS)
+group   = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH, CFLAGS=CFLAGS)
 
 Return('group')
diff --git a/bsp/tm4c129x/libraries/SConscript b/bsp/tm4c129x/libraries/SConscript
index 56c7b84ab3..9262cbfe87 100644
--- a/bsp/tm4c129x/libraries/SConscript
+++ b/bsp/tm4c129x/libraries/SConscript
@@ -6,7 +6,7 @@ from building import *
 cwd     = GetCurrentDir()
 src = Glob('driverlib/*.c')
 SrcRemove(src, 'onewire.c')
-CCFLAGS = ''
+CFLAGS = ''
 
 # add for startup script 
 if rtconfig.CROSS_TOOL == 'gcc':
@@ -15,12 +15,12 @@ elif rtconfig.CROSS_TOOL == 'keil':
     src += ['startup/startup_rvmdk.S']
 elif rtconfig.CROSS_TOOL == 'iar':
     src += ['startup/startup_ewarm.c']
-    CCFLAGS += ' --diag_suppress=pe177'
+    CFLAGS += ' --diag_suppress=pe177'
 
 CPPPATH = [cwd, cwd + '/inc', cwd + '/driverlib']
 
 
 CPPDEFINES = [rtconfig.PART_TYPE]
-group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, CCFLAGS = CCFLAGS)
+group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, CFLAGS = CFLAGS)
 
 Return('group')