Changeset 904702d for waflib/Tools/icc.py

Timestamp:

Mar 14, 2015, 6:06:10 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6d7acc8

Parents:

5525507

Message:

waf, waflib: update to 1.8.7

File:

• waflib/Tools/icc.py (modified) (1 diff)

waflib/Tools/icc.py

@@ -10 +10 @@
         if sys.platform=='cygwin':
                 conf.fatal('The Intel compiler does not work on Cygwin')
-        v=conf.env
-        cc=None
-        if v['CC']:cc=v['CC']
-        elif'CC'in conf.environ:cc=conf.environ['CC']
-        if not cc:cc=conf.find_program('icc',var='CC')
-        if not cc:cc=conf.find_program('ICL',var='CC')
-        if not cc:conf.fatal('Intel C Compiler (icc) was not found')
-        cc=conf.cmd_to_list(cc)
+        cc=conf.find_program(['icc','ICL'],var='CC')
         conf.get_cc_version(cc,icc=True)
-        v['CC']=cc
-        v['CC_NAME']='icc'
+        conf.env.CC_NAME='icc'
 def configure(conf):
         conf.find_icc()