From 27511885f34d074258c7d5d9a152f1c604351e33 Mon Sep 17 00:00:00 2001 From: liukangcc Date: Wed, 22 Dec 2021 11:03:03 +0800 Subject: [PATCH] [update] change ccflags to cflags --- .../hal_libraries/ab32vg1_hal/SConscript | 20 ++++++--- .../libraries/hal_libraries/bmsis/SConscript | 24 +++++++--- bsp/ck802/applications/SConscript | 4 +- bsp/gd32/docs/GD32系列BSP制作教程.md | 4 +- bsp/ra6m4-cpk/ports/fal/SConscript | 10 ++--- bsp/ra6m4-cpk/ports/rw007/SConscript | 10 ++--- bsp/stm32/stm32h743-openmv-h7plus/SConstruct | 4 +- .../board/ports/fal/SConscript | 10 ++--- bsp/thead-smart/applications/SConscript | 4 +- bsp/tm4c129x/libraries/SConscript | 6 +-- components/drivers/spi/SConscript | 10 ++--- tools/building.py | 45 +++++++++++++++++-- tools/codelite.py | 4 +- tools/iar.py | 2 +- tools/keil.py | 10 ++--- tools/ses.py | 10 ++--- 16 files changed, 117 insertions(+), 60 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') diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript index d6cb93f7f1..fab1298f8a 100644 --- a/components/drivers/spi/SConscript +++ b/components/drivers/spi/SConscript @@ -4,7 +4,7 @@ import rtconfig cwd = GetCurrentDir() src = ['spi_core.c', 'spi_dev.c'] CPPPATH = [cwd, cwd + '/../include'] -LOCAL_CCFLAGS = '' +LOCAL_CFLAGS = '' if GetDepend('RT_USING_QSPI'): src += ['qspi_core.c'] @@ -26,15 +26,15 @@ if GetDepend('RT_USING_SFUD'): if GetDepend('RT_SFUD_USING_SFDP'): src_device += ['sfud/src/sfud_sfdp.c'] 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' src += src_device -group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SPI'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS) +group = DefineGroup('DeviceDrivers', src, depend = ['RT_USING_SPI'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS) Return('group') diff --git a/tools/building.py b/tools/building.py index 10641c11a9..23fe64e2f6 100644 --- a/tools/building.py +++ b/tools/building.py @@ -557,11 +557,21 @@ def AddDepend(option): def MergeGroup(src_group, group): src_group['src'] = src_group['src'] + group['src'] + if 'CFLAGS' in group: + if 'CFLAGS' in src_group: + src_group['CFLAGS'] = src_group['CFLAGS'] + group['CFLAGS'] + else: + src_group['CFLAGS'] = group['CFLAGS'] if 'CCFLAGS' in group: if 'CCFLAGS' in src_group: src_group['CCFLAGS'] = src_group['CCFLAGS'] + group['CCFLAGS'] else: src_group['CCFLAGS'] = group['CCFLAGS'] + if 'CXXFLAGS' in group: + if 'CXXFLAGS' in src_group: + src_group['CXXFLAGS'] = src_group['CXXFLAGS'] + group['CXXFLAGS'] + else: + src_group['CXXFLAGS'] = group['CXXFLAGS'] if 'CPPPATH' in group: if 'CPPPATH' in src_group: src_group['CPPPATH'] = src_group['CPPPATH'] + group['CPPPATH'] @@ -579,11 +589,21 @@ def MergeGroup(src_group, group): src_group['ASFLAGS'] = group['ASFLAGS'] # for local CCFLAGS/CPPPATH/CPPDEFINES + if 'LOCAL_CFLAGS' in group: + if 'LOCAL_CFLAGS' in src_group: + src_group['LOCAL_CFLAGS'] = src_group['LOCAL_CFLAGS'] + group['LOCAL_CFLAGS'] + else: + src_group['LOCAL_CFLAGS'] = group['LOCAL_CFLAGS'] if 'LOCAL_CCFLAGS' in group: if 'LOCAL_CCFLAGS' in src_group: src_group['LOCAL_CCFLAGS'] = src_group['LOCAL_CCFLAGS'] + group['LOCAL_CCFLAGS'] else: src_group['LOCAL_CCFLAGS'] = group['LOCAL_CCFLAGS'] + if 'LOCAL_CXXFLAGS' in group: + if 'LOCAL_CXXFLAGS' in src_group: + src_group['LOCAL_CXXFLAGS'] = src_group['LOCAL_CXXFLAGS'] + group['LOCAL_CXXFLAGS'] + else: + src_group['LOCAL_CXXFLAGS'] = group['LOCAL_CXXFLAGS'] if 'LOCAL_CPPPATH' in group: if 'LOCAL_CPPPATH' in src_group: src_group['LOCAL_CPPPATH'] = src_group['LOCAL_CPPPATH'] + group['LOCAL_CPPPATH'] @@ -650,10 +670,18 @@ def DefineGroup(name, src, depend, **parameters): else: group['src'] = src + if 'CFLAGS' in group: + target = group['CFLAGS'] + if len(target) > 0: + Env.AppendUnique(CFLAGS = target) if 'CCFLAGS' in group: target = group['CCFLAGS'] if len(target) > 0: Env.AppendUnique(CCFLAGS = target) + if 'CXXFLAGS' in group: + target = group['CXXFLAGS'] + if len(target) > 0: + Env.AppendUnique(CXXFLAGS = target) if 'CPPPATH' in group: target = group['CPPPATH'] if _PretreatListParameters(target) == True: @@ -682,11 +710,18 @@ def DefineGroup(name, src, depend, **parameters): import rtconfig if rtconfig.PLATFORM == 'gcc': + if 'CFLAGS' in group: + group['CFLAGS'] = utils.GCCC99Patch(group['CFLAGS']) if 'CCFLAGS' in group: group['CCFLAGS'] = utils.GCCC99Patch(group['CCFLAGS']) + if 'CXXFLAGS' in group: + group['CXXFLAGS'] = utils.GCCC99Patch(group['CXXFLAGS']) if 'LOCAL_CCFLAGS' in group: group['LOCAL_CCFLAGS'] = utils.GCCC99Patch(group['LOCAL_CCFLAGS']) - + if 'LOCAL_CXXFLAGS' in group: + group['LOCAL_CXXFLAGS'] = utils.GCCC99Patch(group['LOCAL_CXXFLAGS']) + if 'LOCAL_CFLAGS' in group: + group['LOCAL_CFLAGS'] = utils.GCCC99Patch(group['LOCAL_CFLAGS']) # check whether to clean up library if GetOption('cleanlib') and os.path.exists(os.path.join(group['path'], GroupLibFullName(name, Env))): if group['src'] != []: @@ -785,14 +820,16 @@ def DoBuilding(target, objects): # handle local group def local_group(group, objects): - if 'LOCAL_CCFLAGS' in group or 'LOCAL_CPPPATH' in group or 'LOCAL_CPPDEFINES' in group or 'LOCAL_ASFLAGS' in group: + if 'LOCAL_CFLAGS' in group or 'LOCAL_CXXFLAGS' in group or 'LOCAL_CCFLAGS' in group or 'LOCAL_CPPPATH' in group or 'LOCAL_CPPDEFINES' in group or 'LOCAL_ASFLAGS' in group: + CFLAGS = Env.get('CFLAGS', '') + group.get('LOCAL_CFLAGS', '') CCFLAGS = Env.get('CCFLAGS', '') + group.get('LOCAL_CCFLAGS', '') + CXXFLAGS = Env.get('CXXFLAGS', '') + group.get('LOCAL_CXXFLAGS', '') CPPPATH = Env.get('CPPPATH', ['']) + group.get('LOCAL_CPPPATH', ['']) CPPDEFINES = Env.get('CPPDEFINES', ['']) + group.get('LOCAL_CPPDEFINES', ['']) ASFLAGS = Env.get('ASFLAGS', '') + group.get('LOCAL_ASFLAGS', '') for source in group['src']: - objects.append(Env.Object(source, CCFLAGS = CCFLAGS, ASFLAGS = ASFLAGS, + objects.append(Env.Object(source, CFLAGS = CFLAGS, CCFLAGS = CCFLAGS, CXXFLAGS = CXXFLAGS, ASFLAGS = ASFLAGS, CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)) return True @@ -822,7 +859,7 @@ def DoBuilding(target, objects): else: # remove source files with local flags setting for group in Projects: - if 'LOCAL_CCFLAGS' in group or 'LOCAL_CPPPATH' in group or 'LOCAL_CPPDEFINES' in group: + if 'LOCAL_CFLAGS' in group or 'LOCAL_CXXFLAGS' in group or 'LOCAL_CCFLAGS' in group or 'LOCAL_CPPPATH' in group or 'LOCAL_CPPDEFINES' in group: for source in group['src']: for obj in objects: if source.abspath == obj.abspath or (len(obj.sources) > 0 and source.abspath == obj.sources[0].abspath): diff --git a/tools/codelite.py b/tools/codelite.py index 9b2060dfa5..f4e612be61 100644 --- a/tools/codelite.py +++ b/tools/codelite.py @@ -194,8 +194,8 @@ def TargetCodelite(script, program): #print building.Env.get('LIBPATH', []) #print building.Env.get('LIBS', []) - CLSetCFlags(root, building.Env.get('CCFLAGS', [])) - CLSetCxxFlags(root, building.Env.get('CCFLAGS', [])) + CLSetCFlags(root, building.Env.get('CFLAGS', [])) + CLSetCxxFlags(root, building.Env.get('CFLAGS', [])) asflags = building.Env.get('ASFLAGS', []) asflags = asflags.replace('-ffunction-sections', '') diff --git a/tools/iar.py b/tools/iar.py index a0028128e3..6b31976d05 100644 --- a/tools/iar.py +++ b/tools/iar.py @@ -88,7 +88,7 @@ def IARProject(target, script): CPPPATH = [] CPPDEFINES = [] LINKFLAGS = '' - CCFLAGS = '' + CFLAGS = '' Libs = [] lib_prefix = ['lib', ''] lib_suffix = ['.a', '.o', ''] diff --git a/tools/keil.py b/tools/keil.py index b3643fbe74..b1ce0610c4 100644 --- a/tools/keil.py +++ b/tools/keil.py @@ -192,7 +192,7 @@ def MDK45Project(tree, target, script): CPPPATH = [] CPPDEFINES = [] LINKFLAGS = '' - CCFLAGS = '' + CFLAGS = '' ProjectFiles = [] # add group @@ -204,14 +204,14 @@ def MDK45Project(tree, target, script): group_tree = MDK4AddGroup(ProjectFiles, groups, group['name'], group['src'], project_path) # for local CPPPATH/CPPDEFINES - if (group_tree != None) and ('LOCAL_CPPPATH' in group or 'LOCAL_CCFLAGS' in group or 'LOCAL_CPPDEFINES' in group): + if (group_tree != None) and ('LOCAL_CPPPATH' in group or 'LOCAL_CFLAGS' in group or 'LOCAL_CPPDEFINES' in group): GroupOption = SubElement(group_tree, 'GroupOption') GroupArmAds = SubElement(GroupOption, 'GroupArmAds') Cads = SubElement(GroupArmAds, 'Cads') VariousControls = SubElement(Cads, 'VariousControls') MiscControls = SubElement(VariousControls, 'MiscControls') - if 'LOCAL_CCFLAGS' in group: - MiscControls.text = group['LOCAL_CCFLAGS'] + if 'LOCAL_CFLAGS' in group: + MiscControls.text = group['LOCAL_CFLAGS'] else: MiscControls.text = ' ' Define = SubElement(VariousControls, 'Define') @@ -329,7 +329,7 @@ def MDKProject(target, script): CPPPATH = [] CPPDEFINES = [] LINKFLAGS = '' - CCFLAGS = '' + CFLAGS = '' # number of groups group_index = 1 diff --git a/tools/ses.py b/tools/ses.py index cc513f0baa..67ea8b0cbe 100644 --- a/tools/ses.py +++ b/tools/ses.py @@ -49,7 +49,7 @@ def SESProject(env) : CPPPATH = [] CPPDEFINES = [] LINKFLAGS = '' - CCFLAGS = '' + CFLAGS = '' project_node = tree.find('project') @@ -59,11 +59,11 @@ def SESProject(env) : group_tree = SDKAddGroup(project_node, group['name'], group['src'], project_path) # get each group's cc flags - if 'CCFLAGS' in group and group['CCFLAGS']: - if CCFLAGS: - CCFLAGS += ' ' + group['CCFLAGS'] + if 'CFLAGS' in group and group['CFLAGS']: + if CFLAGS: + CFLAGS += ' ' + group['CFLAGS'] else: - CCFLAGS += group['CCFLAGS'] + CFLAGS += group['CFLAGS'] # get each group's link flags if 'LINKFLAGS' in group and group['LINKFLAGS']: