diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-03 15:55:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 15:55:51 -0500 |
| commit | 35633c68656ef2d4856e816f9701458d1a6a9e8a (patch) | |
| tree | a8f9a6319fc8f363ce41001e551604801447609c /mesonbuild/environment.py | |
| parent | 027af6b064381a1a48f7fe76d3b54162e5d095e7 (diff) | |
| parent | a99732aaf2e84e2c08e976f05e98e2d7aa96c7d5 (diff) | |
| download | meson-35633c68656ef2d4856e816f9701458d1a6a9e8a.zip meson-35633c68656ef2d4856e816f9701458d1a6a9e8a.tar.gz meson-35633c68656ef2d4856e816f9701458d1a6a9e8a.tar.bz2 | |
Merge pull request #1253 from geier1993/intel
Intel C/C++ Compiler support
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 2e5387d..48f5865 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -396,6 +396,10 @@ class Environment(): # everything else to stdout. Why? Lord only knows. version = search_version(err) return VisualStudioCCompiler([compiler], version, is_cross, exe_wrap) + if '(ICC)' in out: + # TODO: add microsoft add check OSX + inteltype = ICC_STANDARD + return IntelCCompiler(ccache + [compiler], version, inteltype, is_cross, exe_wrap) errmsg = 'Unknown compiler(s): "' + ', '.join(compilers) + '"' if popen_exceptions: errmsg += '\nThe follow exceptions were encountered:' @@ -525,6 +529,10 @@ class Environment(): if 'Microsoft' in out or 'Microsoft' in err: version = search_version(err) return VisualStudioCPPCompiler([compiler], version, is_cross, exe_wrap) + if '(ICC)' in out: + # TODO: add microsoft add check OSX + inteltype = ICC_STANDARD + return IntelCPPCompiler(ccache + [compiler], version, inteltype, is_cross, exe_wrap) errmsg = 'Unknown compiler(s): "' + ', '.join(compilers) + '"' if popen_exceptions: errmsg += '\nThe follow exceptions were encountered:' |