diff --git a/waflib/Tools/suncc.py b/waflib/Tools/suncc.py
index 7a222d9b..e705c328 100644
--- a/waflib/Tools/suncc.py
+++ b/waflib/Tools/suncc.py
@@ -3,7 +3,6 @@
 # Thomas Nagy, 2006-2010 (ita)
 # Ralf Habacker, 2006 (rh)
 
-import os
 from waflib import Utils
 from waflib.Tools import ccroot, ar
 from waflib.Configure import conf
@@ -14,19 +13,13 @@ def find_scc(conf):
 	Detect the Sun C compiler
 	"""
 	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('cc', var='CC')
-	if not cc: conf.fatal('Could not find a Sun C compiler')
+	cc = conf.find_program('cc', var='CC')
 
 	try:
 		conf.cmd_and_log(cc + ['-flags'])
 	except Exception:
 		conf.fatal('%r is not a Sun compiler' % cc)
-
-	v['CC']  = cc
-	v['CC_NAME'] = 'sun'
+	v.CC_NAME = 'sun'
 	conf.get_suncc_version(cc)
 
 
diff --git a/waflib/Tools/suncxx.py b/waflib/Tools/suncxx.py
index a2e10707..01b3f8d2 100644
--- a/waflib/Tools/suncxx.py
+++ b/waflib/Tools/suncxx.py
@@ -3,7 +3,6 @@
 # Thomas Nagy, 2006-2010 (ita)
 # Ralf Habacker, 2006 (rh)
 
-import os
 from waflib import Utils
 from waflib.Tools import ccroot, ar
 from waflib.Configure import conf
@@ -14,23 +13,14 @@ def find_sxx(conf):
 	Detect the sun C++ compiler
 	"""
 	v = conf.env
-	cc = None
-	if v['CXX']: cc = v['CXX']
-	elif 'CXX' in conf.environ: cc = conf.environ['CXX']
-	if not cc: cc = conf.find_program('CC', var='CXX') #studio
-	if not cc: cc = conf.find_program('c++', var='CXX')
-	if not cc: conf.fatal('Could not find a Sun C++ compiler')
-
+	cc = conf.find_program(['CC', 'c++'], var='CXX')
 	try:
 		conf.cmd_and_log(cc + ['-flags'])
 	except Exception:
 		conf.fatal('%r is not a Sun compiler' % cc)
-
-	v['CXX']  = cc
-	v['CXX_NAME'] = 'sun'
+	v.CXX_NAME = 'sun'
 	conf.get_suncc_version(cc)
 
-
 @conf
 def sxx_common_flags(conf):
 	"""
diff --git a/waflib/Tools/xlc.py b/waflib/Tools/xlc.py
index 071ed46b..3bd8d026 100644
--- a/waflib/Tools/xlc.py
+++ b/waflib/Tools/xlc.py
@@ -16,7 +16,6 @@ def find_xlc(conf):
 	cc = conf.find_program(['xlc_r', 'xlc'], var='CC')
 	conf.get_xlc_version(cc)
 	conf.env.CC_NAME = 'xlc'
-	conf.env.CC      = cc
 
 @conf
 def xlc_common_flags(conf):
diff --git a/waflib/Tools/xlcxx.py b/waflib/Tools/xlcxx.py
index c4288800..150aeaa4 100644
--- a/waflib/Tools/xlcxx.py
+++ b/waflib/Tools/xlcxx.py
@@ -16,7 +16,6 @@ def find_xlcxx(conf):
 	cxx = conf.find_program(['xlc++_r', 'xlc++'], var='CXX')
 	conf.get_xlc_version(cxx)
 	conf.env.CXX_NAME = 'xlc++'
-	conf.env.CXX      = cxx
 
 @conf
 def xlcxx_common_flags(conf):