From 0efab591da210418e0d618449be2f9462d5d58e8 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 27 Aug 2019 14:50:10 -0700 Subject: compilers: Move the compiler argument to proxy linker flags to the compiler class Instead of the DynamicLinker returning a hardcoded value like `-Wl,-foo`, it now is passed a value that could be '-Wl,', or could be something '-Xlinker=' This makes a few things cleaner, and will make it possible to fix using clang (not clang-cl) on windows, where it invokes either link.exe or lld-link.exe instead of a gnu-ld compatible linker. --- mesonbuild/compilers/compilers.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mesonbuild/compilers/compilers.py') diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index f16e447..4218775 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -650,6 +650,8 @@ class Compiler: # manually searched. internal_libs = () + LINKER_PREFIX = None # type: typing.Union[None, str, typing.List[str]] + def __init__(self, exelist, version, for_machine: MachineChoice, linker: typing.Optional['DynamicLinker'] = None, **kwargs): if isinstance(exelist, str): -- cgit v1.1