Chiebot-Mirror
/
meson
mirror of https://github.com/mesonbuild/meson.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4451 from jon-turney/simplify-x86-msvc-test

Browse Source 
Simplify x86 msvc test
pull/4691/head
Jussi Pakkanen 6 years ago committed by GitHub
parent c4a6b193d4 4da68b7ba9
commit 3d7c32a34e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      mesonbuild/compilers/c.py
  2. 8
      mesonbuild/compilers/cpp.py
  3. 67
      mesonbuild/environment.py

9
mesonbuild/compilers/c.py
Unescape View File

@ -1290,7 +1290,7 @@ class VisualStudioCCompiler(CCompiler):
'mtd': ['/MTd'], '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) CCompiler.__init__(self, exelist, version, is_cross, exe_wrap)
self.id = 'msvc' self.id = 'msvc'
# /showIncludes is needed for build dependency tracking in Ninja # /showIncludes is needed for build dependency tracking in Ninja
@ -1300,7 +1300,8 @@ class VisualStudioCCompiler(CCompiler):
'2': ['/W3'], '2': ['/W3'],
'3': ['/W4']} '3': ['/W4']}
self.base_options = ['b_pch', 'b_ndebug', 'b_vscrt'] # FIXME add lto, pgo and the like 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 # Override CCompiler.get_always_args
def get_always_args(self): def get_always_args(self):
@ -1588,8 +1589,8 @@ class VisualStudioCCompiler(CCompiler):
class ClangClCCompiler(VisualStudioCCompiler): class ClangClCCompiler(VisualStudioCCompiler):
def __init__(self, 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, is_64) super().__init__(exelist, version, is_cross, exe_wrap, target)
self.id = 'clang-cl' self.id = 'clang-cl'

8
mesonbuild/compilers/cpp.py
Unescape View File

@ -308,9 +308,9 @@ class IntelCPPCompiler(IntelCompiler, CPPCompiler):
class VisualStudioCPPCompiler(VisualStudioCCompiler, 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) 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 self.base_options = ['b_pch', 'b_vscrt'] # FIXME add lto, pgo and the like
def get_options(self): def get_options(self):
@ -387,8 +387,8 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler):
return VisualStudioCCompiler.get_compiler_check_args(self) return VisualStudioCCompiler.get_compiler_check_args(self)
class ClangClCPPCompiler(VisualStudioCPPCompiler, ClangClCCompiler): class ClangClCPPCompiler(VisualStudioCPPCompiler, ClangClCCompiler):
def __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, is_64) VisualStudioCPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap, target)
self.id = 'clang-cl' self.id = 'clang-cl'
class ArmCPPCompiler(ArmCompiler, CPPCompiler): class ArmCPPCompiler(ArmCompiler, CPPCompiler):

67
mesonbuild/environment.py
Unescape View File

@ -137,7 +137,7 @@ def detect_ninja(version='1.5', log=False):
def detect_native_windows_arch(): def detect_native_windows_arch():
""" """
The architecture of Windows itself: x86 or amd64 The architecture of Windows itself: x86, amd64 or arm64
""" """
# These env variables are always available. See: # These env variables are always available. See:
# https://msdn.microsoft.com/en-us/library/aa384274(VS.85).aspx # https://msdn.microsoft.com/en-us/library/aa384274(VS.85).aspx
@ -167,45 +167,25 @@ def detect_windows_arch(compilers):
easily detected. easily detected.
In the end, the sanest method is as follows: In the end, the sanest method is as follows:
1. Check if we're in an MSVC toolchain environment, and if so, return the 1. Check environment variables that are set by Windows and WOW64 to find out
MSVC toolchain architecture as our 'native' architecture. if this is x86 (possibly in WOW64), if so use that as our 'native'
2. If not, check environment variables that are set by Windows and WOW64 to architecture.
find out the architecture that Windows is built for, and use that as our 2. If the compiler toolchain target architecture is x86, use that as our
'native' architecture. 'native' architecture.
3. Otherwise, use the actual Windows architecture
""" """
os_arch = detect_native_windows_arch() os_arch = detect_native_windows_arch()
if os_arch != 'amd64': if os_arch == 'x86':
return os_arch return os_arch
# If we're on 64-bit Windows, 32-bit apps can be compiled without # If we're on 64-bit Windows, 32-bit apps can be compiled without
# cross-compilation. So if we're doing that, just set the native arch as # cross-compilation. So if we're doing that, just set the native arch as
# 32-bit and pretend like we're running under WOW64. Else, return the # 32-bit and pretend like we're running under WOW64. Else, return the
# actual Windows architecture that we deduced above. # actual Windows architecture that we deduced above.
for compiler in compilers.values(): for compiler in compilers.values():
# Check if we're using and inside an MSVC toolchain environment if compiler.id == 'msvc' and compiler.target == 'x86':
if compiler.id == 'msvc' and 'VCINSTALLDIR' in os.environ:
if float(compiler.get_toolset_version()) < 10.0:
# On MSVC 2008 and earlier, check 'BUILD_PLAT', where
# 'Win32' means 'x86'
platform = os.environ.get('BUILD_PLAT', os_arch)
if platform == 'Win32':
return 'x86' return 'x86'
elif 'VSCMD_ARG_TGT_ARCH' in os.environ: if compiler.id == 'clang-cl' and compiler.target == 'x86':
# On MSVC 2017 'Platform' is not set in VsDevCmd.bat
return os.environ['VSCMD_ARG_TGT_ARCH']
else:
# Starting with VS 2017, `Platform` is not always set (f.ex.,
# if you use VsDevCmd.bat directly instead of vcvars*.bat), but
# `VSCMD_ARG_HOST_ARCH` is always set, so try that first.
if 'VSCMD_ARG_HOST_ARCH' in os.environ:
platform = os.environ['VSCMD_ARG_HOST_ARCH'].lower()
# On VS 2010-2015, 'Platform' is only set when the
# target arch is not 'x86'. It's 'x64' when targeting
# x86_64 and 'arm' when targeting ARM.
else:
platform = os.environ.get('Platform', 'x86').lower()
if platform == 'x86':
return platform
if compiler.id == 'clang-cl' and not compiler.is_64:
return 'x86' return 'x86'
if compiler.id == 'gcc' and compiler.has_builtin_define('__i386__'): if compiler.id == 'gcc' and compiler.has_builtin_define('__i386__'):
return 'x86' return 'x86'
@ -660,9 +640,13 @@ class Environment:
except OSError as e: except OSError as e:
popen_exceptions[' '.join(compiler + [arg])] = e popen_exceptions[' '.join(compiler + [arg])] = e
version = search_version(out) version = search_version(out)
is_64 = 'Target: x86_64' in out match = re.search('^Target: (.*?)-', out, re.MULTILINE)
if match:
target = match.group(1)
else:
target = 'unknown target'
cls = ClangClCCompiler if lang == 'c' else ClangClCPPCompiler cls = ClangClCCompiler if lang == 'c' else ClangClCPPCompiler
return cls(compiler, version, is_cross, exe_wrap, is_64) return cls(compiler, version, is_cross, exe_wrap, target)
if 'clang' in out: if 'clang' in out:
if 'Apple' in out or mesonlib.for_darwin(want_cross, self): if 'Apple' in out or mesonlib.for_darwin(want_cross, self):
compiler_type = CompilerType.CLANG_OSX compiler_type = CompilerType.CLANG_OSX
@ -677,15 +661,20 @@ class Environment:
# number to stderr but earlier ones print version # number to stderr but earlier ones print version
# on stdout. Why? Lord only knows. # on stdout. Why? Lord only knows.
# Check both outputs to figure out version. # Check both outputs to figure out version.
version = search_version(err) for lookat in [err, out]:
if version == 'unknown version': version = search_version(lookat)
version = search_version(out) if version != 'unknown version':
if version == 'unknown version': break
m = 'Failed to detect MSVC compiler arch: stderr was\n{!r}' else:
m = 'Failed to detect MSVC compiler version: stderr was\n{!r}'
raise EnvironmentException(m.format(err)) raise EnvironmentException(m.format(err))
is_64 = err.split('\n')[0].endswith(' x64') match = re.search(' for (.*)$', lookat.split('\n')[0])
if match:
target = match.group(1)
else:
target = 'x86'
cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler
return cls(compiler, version, is_cross, exe_wrap, is_64) return cls(compiler, version, is_cross, exe_wrap, target)
if '(ICC)' in out: if '(ICC)' in out:
if mesonlib.for_darwin(want_cross, self): if mesonlib.for_darwin(want_cross, self):
compiler_type = CompilerType.ICC_OSX compiler_type = CompilerType.ICC_OSX

Write Preview
Loading…
Cancel
Save