diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-07-19 15:50:04 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-19 15:50:04 +0300 |
| commit | e89b6cdd1037d4c7cfdcb37555f2cbaf66f6ae05 (patch) | |
| tree | e812ee63ecf54b37d17611e8514c5223ff058e47 /mesonbuild/environment.py | |
| parent | acb7e3aaa0a006b36ad8fb86527e46c3b17ff70c (diff) | |
| parent | c8981ff111ccb2419c8689dadc567760e0a20750 (diff) | |
| download | meson-e89b6cdd1037d4c7cfdcb37555f2cbaf66f6ae05.zip meson-e89b6cdd1037d4c7cfdcb37555f2cbaf66f6ae05.tar.gz meson-e89b6cdd1037d4c7cfdcb37555f2cbaf66f6ae05.tar.bz2 | |
Merge pull request #1374 from mesonbuild/simd
Add support for SIMD detection
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index a6da3f9..dd9f56e 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -534,8 +534,12 @@ class Environment: # Visual Studio prints version number to stderr but # everything else to stdout. Why? Lord only knows. version = search_version(err) + if not err or not err.split('\n')[0]: + m = 'Failed to detect MSVC compiler arch: stderr was\n{!r}' + raise EnvironmentException(m.format(err)) + is_64 = err.split('\n')[0].endswith(' x64') cls = VisualStudioCCompiler if lang == 'c' else VisualStudioCPPCompiler - return cls(compiler, version, is_cross, exe_wrap) + return cls(compiler, version, is_cross, exe_wrap, is_64) if '(ICC)' in out: # TODO: add microsoft add check OSX inteltype = ICC_STANDARD |