diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-24 19:43:21 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-04 23:38:36 +0530 |
| commit | 6042e21e25e31d4bb794ab83237beac511a15837 (patch) | |
| tree | 09934d50be897233b3044ce3fbf995ebd273a164 /mesonbuild/interpreter.py | |
| parent | 09fee02dd9484e682401469ff890cf99ef5fa56a (diff) | |
| download | meson-6042e21e25e31d4bb794ab83237beac511a15837.zip meson-6042e21e25e31d4bb794ab83237beac511a15837.tar.gz meson-6042e21e25e31d4bb794ab83237beac511a15837.tar.bz2 | |
Use CPPFLAGS for pre-processor compiler checks
Also don't add CFLAGS twice for links() checks
Includes a test for this.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 959ce6a..85e2b9a 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1787,9 +1787,10 @@ class Interpreter(InterpreterBase): raise mlog.log('Native %s compiler: ' % lang, mlog.bold(' '.join(comp.get_exelist())), ' (%s %s)' % (comp.id, comp.version), sep='') if not comp.get_language() in self.coredata.external_args: - (ext_compile_args, ext_link_args) = environment.get_args_from_envvars(comp) - self.coredata.external_args[comp.get_language()] = ext_compile_args - self.coredata.external_link_args[comp.get_language()] = ext_link_args + (preproc_args, compile_args, link_args) = environment.get_args_from_envvars(comp) + self.coredata.external_preprocess_args[comp.get_language()] = preproc_args + self.coredata.external_args[comp.get_language()] = compile_args + self.coredata.external_link_args[comp.get_language()] = link_args self.build.add_compiler(comp) if need_cross_compiler: mlog.log('Cross %s compiler: ' % lang, mlog.bold(' '.join(cross_comp.get_exelist())), ' (%s %s)' % (cross_comp.id, cross_comp.version), sep='') |