diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-25 07:23:15 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-26 23:16:05 +0530 |
commit | 3df75d696d951dc11bae5d287e1062c5299b8367 (patch) | |
tree | 231b669b83ef271977e40e7c9e45ffd1736e30a3 /mesonbuild/interpreter.py | |
parent | 4be8e71fb380a0541b69992539a0695ea29b3205 (diff) | |
download | meson-3df75d696d951dc11bae5d287e1062c5299b8367.zip meson-3df75d696d951dc11bae5d287e1062c5299b8367.tar.gz meson-3df75d696d951dc11bae5d287e1062c5299b8367.tar.bz2 |
Directly pass the compiler to get_args_from_envvars
Seems better to do this since the behaviour is compiler-specific. Would
be easier to extend this later too in case we want to do more
compiler-specific things.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index dd2a227..26c8aef 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1792,11 +1792,8 @@ class Interpreter(): else: raise mlog.log('Native %s compiler: ' % lang, mlog.bold(' '.join(comp.get_exelist())), ' (%s %s)' % (comp.id, comp.version), sep='') - compiler_is_linker = False - if hasattr(comp, 'get_linker_exelist'): - compiler_is_linker = (comp.get_exelist() == comp.get_linker_exelist()) if not comp.get_language() in self.coredata.external_args: - (ext_compile_args, ext_link_args) = environment.get_args_from_envvars(comp.get_language(), compiler_is_linker) + (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 self.build.add_compiler(comp) |