diff options
| author | Karl Linden <karl.j.linden@gmail.com> | 2018-10-06 10:51:14 +0200 |
|---|---|---|
| committer | Karl Linden <karl.j.linden@gmail.com> | 2018-10-06 13:16:24 +0200 |
| commit | eeef49954a0cc4bc5f120c12fe9eb988bd93ccd8 (patch) | |
| tree | acc5261a87172e240c77217eaaec0eb586aa9dfa /waflib/Tools/icc.py | |
| parent | f5f22c6befc1b4bc5807de00496c087125f92adf (diff) | |
| download | jack2-eeef49954a0cc4bc5f120c12fe9eb988bd93ccd8.tar.gz | |
Revert "Stupid attempt at updating waf"
This reverts commit cf3f8205c4509966f04e6b77dad7c002db16d9d8.
It was a good initiative, but waf 2.0 introces backward incompatible
changes that break the pkg-config checks. The config checks will be
updated before migrating to waf 2.0.
Diffstat (limited to 'waflib/Tools/icc.py')
| -rw-r--r-- | waflib/Tools/icc.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/waflib/Tools/icc.py b/waflib/Tools/icc.py index b6492c8e..f3395030 100644 --- a/waflib/Tools/icc.py +++ b/waflib/Tools/icc.py @@ -1,10 +1,10 @@ #!/usr/bin/env python # encoding: utf-8 # Stian Selnes 2008 -# Thomas Nagy 2009-2018 (ita) +# Thomas Nagy 2009-2010 (ita) """ -Detects the Intel C compiler +Detect the Intel C compiler """ import sys @@ -14,8 +14,11 @@ from waflib.Configure import conf @conf def find_icc(conf): """ - Finds the program icc and execute it to ensure it really is icc + Find the program icc and execute it to ensure it really is icc """ + if sys.platform == 'cygwin': + conf.fatal('The Intel compiler does not work on Cygwin') + cc = conf.find_program(['icc', 'ICL'], var='CC') conf.get_cc_version(cc, icc=True) conf.env.CC_NAME = 'icc' |