diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-29 10:36:02 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-02 14:56:23 -0700 |
| commit | da5f07cf39b6ab9b67676f843e16a0e6caeb69a4 (patch) | |
| tree | a0ad837832b7108eed7251e97fdd31a1baecbe18 /mesonbuild/environment.py | |
| parent | 482e26764ed762c0de939cbdd9712be7ca569b9c (diff) | |
| download | meson-da5f07cf39b6ab9b67676f843e16a0e6caeb69a4.zip meson-da5f07cf39b6ab9b67676f843e16a0e6caeb69a4.tar.gz meson-da5f07cf39b6ab9b67676f843e16a0e6caeb69a4.tar.bz2 | |
Revert "detect Intel ICL on windows"
This reverts commit 3a75bb5259abbcae820b47f5f4633c564411893b.
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 582fab1..aed1a5a 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -61,8 +61,6 @@ from .compilers import ( IntelCCompiler, IntelCPPCompiler, IntelFortranCompiler, - IntelClCCompiler, - IntelClCPPCompiler, JavaCompiler, MonoCompiler, CudaCompiler, @@ -681,7 +679,6 @@ class Environment: arg = '-v' else: arg = '--version' - try: p, out, err = Popen_safe(compiler + [arg]) except OSError as e: @@ -690,11 +687,6 @@ class Environment: if 'ccrx' in compiler[0]: out = err - if 'icl' 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 full_version = out.split('\n', 1)[0] version = search_version(out) @@ -794,15 +786,12 @@ class Environment: if mesonlib.for_darwin(want_cross, self): compiler_type = CompilerType.ICC_OSX elif mesonlib.for_windows(want_cross, self): - raise EnvironmentException('At the time of authoring, there was no ICC for Windows') + # TODO: fix ICC on Windows + compiler_type = CompilerType.ICC_WIN else: compiler_type = CompilerType.ICC_STANDARD cls = IntelCCompiler if lang == 'c' else IntelCPPCompiler return cls(ccache + compiler, version, compiler_type, is_cross, exe_wrap, full_version=full_version) - if out.startswith('Intel(R) C++') and mesonlib.for_windows(want_cross, self): - cls = IntelClCCompiler if lang == 'c' else IntelClCPPCompiler - target = 'x64' if 'Intel(R) 64 Compiler' in out else 'x86' - return cls(compiler, version, is_cross, exe_wrap, target) if 'ARM' in out: compiler_type = CompilerType.ARM_WIN cls = ArmCCompiler if lang == 'c' else ArmCPPCompiler @@ -1066,8 +1055,8 @@ class Environment: # up to date language version at time (2016). if exelist is not None: if os.path.basename(exelist[-1]).startswith(('ldmd', 'gdmd')): - raise EnvironmentException('Meson does not support {} as it is only a DMD frontend for another compiler.' - 'Please provide a valid value for DC or unset it so that Meson can resolve the compiler by itself.'.format(exelist[-1])) + raise EnvironmentException('Meson does not support {} as it is only a DMD frontend for another compiler.'.format(exelist[-1]) + 'Please provide a valid value for DC or unset it so that Meson can resolve the compiler by itself.') else: for d in self.default_d: if shutil.which(d): |