diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2024-04-05 00:08:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-05 00:08:09 +0300 |
commit | 30c38e2bd69b2bab74b6e76da1c626f3c9853613 (patch) | |
tree | 81951d3bfe27ef63432321fe8a038cb482b59e19 /mesonbuild/linkers | |
parent | e00710a0a98e818418a62466284bdfc200142b0c (diff) | |
parent | f3fad6cc5f948b0c7557bdce3959c71420183be9 (diff) | |
download | meson-30c38e2bd69b2bab74b6e76da1c626f3c9853613.zip meson-30c38e2bd69b2bab74b6e76da1c626f3c9853613.tar.gz meson-30c38e2bd69b2bab74b6e76da1c626f3c9853613.tar.bz2 |
Merge pull request #12144 from amyspark/fix-msvc-clangcl-linker-flag-detection
linkers: Fix detection of link arguments to Clang(-cl) + MSVC
Diffstat (limited to 'mesonbuild/linkers')
-rw-r--r-- | mesonbuild/linkers/detect.py | 3 | ||||
-rw-r--r-- | mesonbuild/linkers/linkers.py | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py index 1bce413..bb391d1 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py @@ -55,6 +55,9 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty if value is not None: override = comp_class.use_linker_args(value[0], comp_version) check_args += override + elif 'lld-link' in compiler: + override = comp_class.use_linker_args('lld-link', comp_version) + check_args += override if extra_args is not None: check_args.extend(extra_args) diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index 657e361..ca3c854 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -1319,6 +1319,9 @@ class MSVCDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker): def get_win_subsystem_args(self, value: str) -> T.List[str]: return self._apply_prefix([f'/SUBSYSTEM:{value.upper()}']) + def fatal_warnings(self) -> T.List[str]: + return ['-WX'] + class ClangClDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker): @@ -1348,6 +1351,9 @@ class ClangClDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker): def get_thinlto_cache_args(self, path: str) -> T.List[str]: return ["/lldltocache:" + path] + def fatal_warnings(self) -> T.List[str]: + return ['-WX'] + class XilinkDynamicLinker(VisualStudioLikeLinkerMixin, DynamicLinker): |