diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-29 10:36:30 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-02 14:56:23 -0700 |
| commit | 482e26764ed762c0de939cbdd9712be7ca569b9c (patch) | |
| tree | c7f36be6ae2720e4422fc2e0b356c3c358e895af /mesonbuild | |
| parent | c0aa89e57ff5a92c1a1e2cf542692f54622d8cd2 (diff) | |
| download | meson-482e26764ed762c0de939cbdd9712be7ca569b9c.zip meson-482e26764ed762c0de939cbdd9712be7ca569b9c.tar.gz meson-482e26764ed762c0de939cbdd9712be7ca569b9c.tar.bz2 | |
Revert "enable Windows Intel compiler"
This reverts commit 50f23815658bb704f454c83edfe2cc7e4e419628.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/environment.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 462672e..582fab1 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -782,9 +782,9 @@ class Environment: return cls(compiler, version, is_cross, exe_wrap, target) if 'PGI Compilers' in out: - if mesonlib.for_darwin(is_cross, self): + if mesonlib.for_darwin(want_cross, self): compiler_type = CompilerType.PGI_OSX - elif mesonlib.for_windows(is_cross, self): + elif mesonlib.for_windows(want_cross, self): compiler_type = CompilerType.PGI_WIN else: compiler_type = CompilerType.PGI_STANDARD @@ -867,13 +867,6 @@ class Environment: popen_exceptions[' '.join(compiler + [arg])] = e continue - if mesonlib.for_windows(is_cross, self): - if 'ifort' in compiler[0]: - # https://software.intel.com/en-us/cpp-compiler-developer-guide-and-reference-alphabetical-list-of-compiler-options - # https://software.intel.com/en-us/fortran-compiler-developer-guide-and-reference-logo - # most consistent way for ICL is to just let compiler error and tell version - out = err - version = search_version(out) full_version = out.split('\n', 1)[0] @@ -904,16 +897,16 @@ class Environment: version = search_version(err) return SunFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) - if 'ifort (IFORT)' in out or out.startswith('Intel(R) Visual Fortran'): + if 'ifort (IFORT)' in out: return IntelFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) if 'PathScale EKOPath(tm)' in err: return PathScaleFortranCompiler(compiler, version, is_cross, exe_wrap, full_version=full_version) if 'PGI Compilers' in out: - if mesonlib.for_darwin(is_cross, self): + if mesonlib.for_darwin(want_cross, self): compiler_type = CompilerType.PGI_OSX - elif mesonlib.for_windows(is_cross, self): + elif mesonlib.for_windows(want_cross, self): compiler_type = CompilerType.PGI_WIN else: compiler_type = CompilerType.PGI_STANDARD |