diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-08-11 16:27:31 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-08-12 15:34:59 +0530 |
| commit | a5e01fa15522c33dfbdfee4cec43227026184c84 (patch) | |
| tree | 5fa2fe6f9f77417d83d2b398a2bf69cb30e6bdc5 /mesonbuild/interpreter.py | |
| parent | 5b7e4ac1f69c88c6bf1d46e92a41e60ea666c753 (diff) | |
| download | meson-a5e01fa15522c33dfbdfee4cec43227026184c84.zip meson-a5e01fa15522c33dfbdfee4cec43227026184c84.tar.gz meson-a5e01fa15522c33dfbdfee4cec43227026184c84.tar.bz2 | |
Only append compile flags to the link flags when appropriate
We should only append the compiler flags to the link flags when the
compiler is used as a wrapper around the linker during the link process
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 9c2a74c..8645b68 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1619,8 +1619,11 @@ 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()) + (ext_compile_args, ext_link_args) = environment.get_args_from_envvars(comp.get_language(), compiler_is_linker) 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) |