diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-11-27 01:11:27 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-11-27 01:17:34 +0200 |
commit | b57f3305cdd2c341275811f0b14e568b7366ce2a (patch) | |
tree | 8999988795ad0b4fd99ecc31b55614810aae28f3 | |
parent | 37ffff0aeddaf1f7a92076559484b9a6bce8c455 (diff) | |
download | meson-filterwl.tar.gz |
Remove linkerlike args from compile checks. Closes #4542.filterwl
-rw-r--r-- | mesonbuild/compilers/c.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 88ad7b6d8..4d400db57 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -427,7 +427,13 @@ class CCompiler(Compiler): args += env.coredata.get_external_preprocess_args(self.language) elif mode == 'compile': # Add CFLAGS/CXXFLAGS/OBJCFLAGS/OBJCXXFLAGS from the env - args += env.coredata.get_external_args(self.language) + sys_args = env.coredata.get_external_args(self.language) + # Apparently it is a thing to inject linker flags _both_ + # via CFLAGS and LDFLAGS. Even though the latter are + # also used during linking. These flags can break + # argument checks. Thanks, Autotools. + cleaned_sys_args = self.remove_linkerlike_args(sys_args) + args += cleaned_sys_args elif mode == 'link': # Add LDFLAGS from the env args += env.coredata.get_external_link_args(self.language) @@ -436,6 +442,9 @@ class CCompiler(Compiler): args += extra_args return args + def remove_linkerlike_args(self, args): + return [x for x in args if not x.startswith('-Wl')] + def compiles(self, code, env, *, extra_args=None, dependencies=None, mode='compile'): with self._build_wrapper(code, env, extra_args, dependencies, mode) as p: return p.returncode == 0 |