diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-08-15 20:39:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-15 20:39:53 +0200 |
| commit | 5b1559a4e8fdd9eb506e69371df975a223abde46 (patch) | |
| tree | 82303cc582ff2fa1a5cb5cf77b54b78518bed42f /mesonbuild/interpreter.py | |
| parent | c6ca8a59be5f1a8dd42f2087c7f3f29a4e76a0ed (diff) | |
| parent | a5e01fa15522c33dfbdfee4cec43227026184c84 (diff) | |
| download | meson-5b1559a4e8fdd9eb506e69371df975a223abde46.zip meson-5b1559a4e8fdd9eb506e69371df975a223abde46.tar.gz meson-5b1559a4e8fdd9eb506e69371df975a223abde46.tar.bz2 | |
Merge pull request #673 from centricular/inherited-env-flags
Two changes to how we inherit cflags/linkflags from the environment
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) |