diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-29 18:43:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-29 18:43:13 +0200 |
| commit | 3d7c32a34e9d7a1f0e0c5c701f1afdf411b0194c (patch) | |
| tree | 1bc4ed13fbdb9c64c5306add59e18ad694c0159d /mesonbuild/compilers | |
| parent | c4a6b193d4f4043872e5e9f16e75ec76f4582398 (diff) | |
| parent | 4da68b7ba922e1daa5f8ceb852e48a3297d29c70 (diff) | |
| download | meson-3d7c32a34e9d7a1f0e0c5c701f1afdf411b0194c.zip meson-3d7c32a34e9d7a1f0e0c5c701f1afdf411b0194c.tar.gz meson-3d7c32a34e9d7a1f0e0c5c701f1afdf411b0194c.tar.bz2 | |
Merge pull request #4451 from jon-turney/simplify-x86-msvc-test
Simplify x86 msvc test
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/c.py | 9 | ||||
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index b009645..46f4181 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -1290,7 +1290,7 @@ class VisualStudioCCompiler(CCompiler): 'mtd': ['/MTd'], } - def __init__(self, exelist, version, is_cross, exe_wrap, is_64): + def __init__(self, exelist, version, is_cross, exe_wrap, target): CCompiler.__init__(self, exelist, version, is_cross, exe_wrap) self.id = 'msvc' # /showIncludes is needed for build dependency tracking in Ninja @@ -1300,7 +1300,8 @@ class VisualStudioCCompiler(CCompiler): '2': ['/W3'], '3': ['/W4']} self.base_options = ['b_pch', 'b_ndebug', 'b_vscrt'] # FIXME add lto, pgo and the like - self.is_64 = is_64 + self.target = target + self.is_64 = ('x64' in target) or ('x86_64' in target) # Override CCompiler.get_always_args def get_always_args(self): @@ -1588,8 +1589,8 @@ class VisualStudioCCompiler(CCompiler): class ClangClCCompiler(VisualStudioCCompiler): - def __init__(self, exelist, version, is_cross, exe_wrap, is_64): - super().__init__(exelist, version, is_cross, exe_wrap, is_64) + def __init__(self, exelist, version, is_cross, exe_wrap, target): + super().__init__(exelist, version, is_cross, exe_wrap, target) self.id = 'clang-cl' diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 87371c0..d702e83 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -308,9 +308,9 @@ class IntelCPPCompiler(IntelCompiler, CPPCompiler): class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): - def __init__(self, exelist, version, is_cross, exe_wrap, is_64): + def __init__(self, exelist, version, is_cross, exe_wrap, target): CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap) - VisualStudioCCompiler.__init__(self, exelist, version, is_cross, exe_wrap, is_64) + VisualStudioCCompiler.__init__(self, exelist, version, is_cross, exe_wrap, target) self.base_options = ['b_pch', 'b_vscrt'] # FIXME add lto, pgo and the like def get_options(self): @@ -387,8 +387,8 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): return VisualStudioCCompiler.get_compiler_check_args(self) class ClangClCPPCompiler(VisualStudioCPPCompiler, ClangClCCompiler): - def __init__(self, exelist, version, is_cross, exe_wrap, is_64): - VisualStudioCPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, is_64) + def __init__(self, exelist, version, is_cross, exe_wrap, target): + VisualStudioCPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, target) self.id = 'clang-cl' class ArmCPPCompiler(ArmCompiler, CPPCompiler): |