diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-11 23:51:56 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-07-13 15:28:38 +0000 |
commit | 21da2c90408746b8151a5e414930d6c637c78a57 (patch) | |
tree | 507d0029d8720d21b76a0131628f4cc979cc135a /mesonbuild/linkers.py | |
parent | c57616884f02dfd661bca5766acd409582dac83b (diff) | |
download | meson-21da2c90408746b8151a5e414930d6c637c78a57.zip meson-21da2c90408746b8151a5e414930d6c637c78a57.tar.gz meson-21da2c90408746b8151a5e414930d6c637c78a57.tar.bz2 |
Fix native builds on Windows ARM64 machines
I made the mistake of always selecting the debug CRT for compiler
checks on Windows 4 years ago:
https://github.com/mesonbuild/meson/pull/543
https://github.com/mesonbuild/meson/pull/614
The idea was to always build the tests with debugging enabled so that
the compiler doesn't optimize the tests away. But we stopped doing
that a while ago, and also the debug CRT has no relation to that.
We should select the CRT in the same way that we do for building
targets: based on the options.
On Windows ARM64, the debug CRT for ARM64 isn't always available, and
the release CRT is available only after installing the runtime
package. Without this, we will always try to pick the debug CRT even
when --buildtype=debugoptimized or release.
Diffstat (limited to 'mesonbuild/linkers.py')
-rw-r--r-- | mesonbuild/linkers.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 4264e7d..fe1441e 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -451,9 +451,6 @@ class DynamicLinker(LinkerEnvVarsMixin, metaclass=abc.ABCMeta): def bitcode_args(self) -> T.List[str]: raise mesonlib.MesonException('This linker does not support bitcode bundles') - def get_debug_crt_args(self) -> T.List[str]: - return [] - def build_rpath_args(self, env: 'Environment', build_dir: str, from_dir: str, rpath_paths: str, build_rpath: str, install_rpath: str) -> T.Tuple[T.List[str], T.Set[bytes]]: @@ -998,16 +995,6 @@ class VisualStudioLikeLinkerMixin: def invoked_by_compiler(self) -> bool: return not self.direct - def get_debug_crt_args(self) -> T.List[str]: - """Arguments needed to select a debug crt for the linker. - - Sometimes we need to manually select the CRT (C runtime) to use with - MSVC. One example is when trying to link with static libraries since - MSVC won't auto-select a CRT for us in that case and will error out - asking us to select one. - """ - return self._apply_prefix('/MDd') - def get_output_args(self, outputname: str) -> T.List[str]: return self._apply_prefix(['/MACHINE:' + self.machine, '/OUT:' + outputname]) |