Clean up some cruft in the compiler tools (icc, icpc, gxx)

waflib/Configure.py

@@ -550,11 +550,9 @@ def find_program(self, filename, **kw):
 	if interpreter is None:
 		if not Utils.check_exe(ret[0]):
 			self.fatal('Program %s is not executable' % ret)
-		if var:
-			self.env[var] = ret
+		self.env[var] = ret
 	else:
-		if var:
-			self.env[var] = self.env[interpreter] + ret
+		self.env[var] = self.env[interpreter] + ret
 
 	return ret
 

waflib/Tools/gxx.py

@@ -21,7 +21,6 @@ def find_gxx(conf):
 	cxx = conf.find_program(['g++', 'c++'], var='CXX')
 	conf.get_cc_version(cxx, gcc=True)
 	conf.env.CXX_NAME = 'gcc'
-	conf.env.CXX      = cxx
 
 @conf
 def gxx_common_flags(conf):

waflib/Tools/icc.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # encoding: utf-8
-# Stian Selnes, 2008
+# Stian Selnes 2008
 # Thomas Nagy 2009-2010 (ita)
 
 """
@@ -19,17 +19,9 @@ def find_icc(conf):
 	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.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()

waflib/Tools/icpc.py

@@ -18,16 +18,9 @@ def find_icpc(conf):
 	if sys.platform == 'cygwin':
 		conf.fatal('The Intel compiler does not work on Cygwin')
 
-	v = conf.env
-	cxx = None
-	if v['CXX']: cxx = v['CXX']
-	elif 'CXX' in conf.environ: cxx = conf.environ['CXX']
-	if not cxx: cxx = conf.find_program('icpc', var='CXX')
-	if not cxx: conf.fatal('Intel C++ Compiler (icpc) was not found')
-
+	cxx = conf.find_program('icpc', var='CXX')
 	conf.get_cc_version(cxx, icc=True)
-	v['CXX'] = cxx
-	v['CXX_NAME'] = 'icc'
+	conf.env.CXX_NAME = 'icc'
 
 def configure(conf):
 	conf.find_icpc()