smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

Correctly pass compiler flags as individual list elements so waf can merge them or do whatever clever things it needs to do.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4685 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-26 20:49:21 +00:00
parent 4485edffae
commit 3eeea347f2
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
autowaf.py
View file

@ -129,9 +129,9 @@ def configure(conf):
global g_step global g_step
if g_step > 1: if g_step > 1:
return return
def append_cxx_flags(val): def append_cxx_flags(vals):
conf.env.append_value('CCFLAGS', val) conf.env.append_value('CCFLAGS', vals.split())
conf.env.append_value('CXXFLAGS', val) conf.env.append_value('CXXFLAGS', vals.split())
conf.line_just = 43 conf.line_just = 43
check_tool(conf, 'misc') check_tool(conf, 'misc')
check_tool(conf, 'compiler_cc') check_tool(conf, 'compiler_cc')
@ -201,13 +201,13 @@ def configure(conf):
conf.env['LV2DIRNAME'] = chop_prefix(conf, 'LV2DIR') conf.env['LV2DIRNAME'] = chop_prefix(conf, 'LV2DIR')
if Options.options.debug: if Options.options.debug:
conf.env['CCFLAGS'] = '-O0 -g' conf.env['CCFLAGS'] = [ '-O0', '-g' ]
conf.env['CXXFLAGS'] = '-O0 -g' conf.env['CXXFLAGS'] = [ '-O0', '-g' ]
else: else:
append_cxx_flags('-DNDEBUG') append_cxx_flags('-DNDEBUG')
if Options.options.strict: if Options.options.strict:
conf.env.append_value('CCFLAGS', '-std=c99 -pedantic') conf.env.append_value('CCFLAGS', [ '-std=c99', '-pedantic' ])
conf.env.append_value('CXXFLAGS', '-ansi -Woverloaded-virtual') conf.env.append_value('CXXFLAGS', [ '-ansi', '-Woverloaded-virtual'])
append_cxx_flags('-Wall -Wextra -Wno-unused-parameter') append_cxx_flags('-Wall -Wextra -Wno-unused-parameter')
append_cxx_flags('-fPIC -DPIC') append_cxx_flags('-fPIC -DPIC')
g_step = 2 g_step = 2