rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_installation_packages' of https://code.google.com/p/nanopb into dev_installation_packages

Browse Source
This commit is contained in:
Petteri Aimonen
2013-12-03 20:36:29 +02:00
parent a5006cc612 7723a30bd6
commit 55bd3d706b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/SConstruct
View File

@@ -35,7 +35,7 @@ env.Append(PROTOCPATH = '#../generator')
if not env.GetOption('clean'): if not env.GetOption('clean'):
def check_ccflags(context, flags): def check_ccflags(context, flags):
'''Check if given CCFLAGS are supported''' '''Check if given CCFLAGS are supported'''
context.Message('Checking support for CCFLAGS="%s"...' % flags) context.Message('Checking support for CCFLAGS="%s"... ' % flags)
oldflags = context.env['CCFLAGS'] oldflags = context.env['CCFLAGS']
context.env.Append(CCFLAGS = flags) context.env.Append(CCFLAGS = flags)
result = context.TryCompile("int main() {return 0;}", '.c') result = context.TryCompile("int main() {return 0;}", '.c')
@@ -75,7 +75,7 @@ if not env.GetOption('clean'):
# Check if we can use extra strict warning flags (only with GCC) # Check if we can use extra strict warning flags (only with GCC)
extra = '-Wcast-qual -Wlogical-op -Wconversion' extra = '-Wcast-qual -Wlogical-op -Wconversion'
extra += ' -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls' extra += ' -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls'
extra += ' -Wstack-protector' extra += ' -Wstack-protector '
if 'gcc' in env['CC']: if 'gcc' in env['CC']:
if conf.CheckCCFLAGS(extra): if conf.CheckCCFLAGS(extra):
conf.env.Append(CORECFLAGS = extra) conf.env.Append(CORECFLAGS = extra)