diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-02 11:41:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 11:41:32 -0700 |
| commit | 97c2321740602ed43a5fbf0ca2cad53a2a622cee (patch) | |
| tree | 809b2b82276627c499808f35b5aaebcf1216d735 /mesonbuild/interpreter.py | |
| parent | afe00697faab16928fc3a801229175a5746d57b7 (diff) | |
| parent | eea951c9f358a3a67fcfd479e20c151e91cbca04 (diff) | |
| download | meson-97c2321740602ed43a5fbf0ca2cad53a2a622cee.zip meson-97c2321740602ed43a5fbf0ca2cad53a2a622cee.tar.gz meson-97c2321740602ed43a5fbf0ca2cad53a2a622cee.tar.bz2 | |
Merge pull request #949 from centricular/has-function-xcode8-fixes
Fix has_function with XCode 8 and related changes
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) |