diff options
| author | David Robillard <d@drobilla.net> | 2009-02-26 20:49:21 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-26 20:49:21 +0000 |
| commit | 3eeea347f2a44305f79bb2220e8c94d6d072d18e (patch) | |
| tree | 04bcc983823148eecb6b1296b2f119e9189e70b5 /autowaf.py | |
| parent | 4485edffae310e44dc990beff4fef773667df380 (diff) | |
Correctly pass compiler flags as individual list elements so waf can merge them or do whatever clever things it needs to do.
git-svn-id: svn://localhost/ardour2/branches/3.0@4685 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'autowaf.py')
| -rw-r--r-- | autowaf.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/autowaf.py b/autowaf.py index ecd3d9adcc..70afaf0414 100644 --- a/autowaf.py +++ b/autowaf.py @@ -129,9 +129,9 @@ def configure(conf): global g_step if g_step > 1: return - def append_cxx_flags(val): - conf.env.append_value('CCFLAGS', val) - conf.env.append_value('CXXFLAGS', val) + def append_cxx_flags(vals): + conf.env.append_value('CCFLAGS', vals.split()) + conf.env.append_value('CXXFLAGS', vals.split()) conf.line_just = 43 check_tool(conf, 'misc') check_tool(conf, 'compiler_cc') @@ -201,13 +201,13 @@ def configure(conf): conf.env['LV2DIRNAME'] = chop_prefix(conf, 'LV2DIR') if Options.options.debug: - conf.env['CCFLAGS'] = '-O0 -g' - conf.env['CXXFLAGS'] = '-O0 -g' + conf.env['CCFLAGS'] = [ '-O0', '-g' ] + conf.env['CXXFLAGS'] = [ '-O0', '-g' ] else: append_cxx_flags('-DNDEBUG') if Options.options.strict: - conf.env.append_value('CCFLAGS', '-std=c99 -pedantic') - conf.env.append_value('CXXFLAGS', '-ansi -Woverloaded-virtual') + conf.env.append_value('CCFLAGS', [ '-std=c99', '-pedantic' ]) + conf.env.append_value('CXXFLAGS', [ '-ansi', '-Woverloaded-virtual']) append_cxx_flags('-Wall -Wextra -Wno-unused-parameter') append_cxx_flags('-fPIC -DPIC') g_step = 2 |