diff options
| author | Martin Storsjö <martin@martin.st> | 2020-09-17 10:00:47 +0300 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-09-17 11:23:36 +0000 |
| commit | deb1d7cababbf0481e85ed710b8d860cdf8179ae (patch) | |
| tree | 6b44f487e322ebb22e727a8eda0a3d9c7e12ac69 | |
| parent | 93b1d31af9d90f306aa104eee1e9be8e1ebbacad (diff) | |
| download | meson-deb1d7cababbf0481e85ed710b8d860cdf8179ae.zip meson-deb1d7cababbf0481e85ed710b8d860cdf8179ae.tar.gz meson-deb1d7cababbf0481e85ed710b8d860cdf8179ae.tar.bz2 | |
Canonicalize target architectures aarch64/armv* into arm64/arm for MSVC tools
If the architectures are taken from the output of "clang-cl --version",
we need to convert these names into names that the MSVC tools accept
as the -machine: parameter.
| -rw-r--r-- | mesonbuild/compilers/mixins/visualstudio.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py index 93101b5..0ea03f0 100644 --- a/mesonbuild/compilers/mixins/visualstudio.py +++ b/mesonbuild/compilers/mixins/visualstudio.py @@ -131,6 +131,10 @@ class VisualStudioLikeCompiler(metaclass=abc.ABCMeta): self.machine = 'x64' elif '86' in target: self.machine = 'x86' + elif 'aarch64' in target: + self.machine = 'arm64' + elif 'arm' in target: + self.machine = 'arm' else: self.machine = target self.linker.machine = self.machine |