From a5e01fa15522c33dfbdfee4cec43227026184c84 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 11 Aug 2016 16:27:31 +0530 Subject: 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 --- mesonbuild/interpreter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mesonbuild/interpreter.py') 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) -- cgit v1.1