Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision aca975825e8c22b4a416e1dff9b0ac2e7672efdb)
+++ tools/autotool.py	(revision 9fb280c18d7a3aadce7085e013cc9625098ea17e)
@@ -306,7 +306,9 @@
 
 	common['CLANG'] = "%sclang" % prefix
+	common['CLANGXX'] = "%sclang++" % prefix
 
 	if (not path is None):
 		common['CLANG'] = "%s/%s" % (path, common['CLANG'])
+		common['CLANGXX'] = "%s/%s" % (path, common['CLANGXX'])
 
 	check_app([common['CLANG'], "--version"], "clang", details)
@@ -625,11 +627,14 @@
 			check_common(common, "CLANG")
 			common['CC'] = common['CLANG']
+			common['CXX'] = common['CLANGXX']
 			cc_autogen = common['CC'] + " -no-integrated-as"
 
 			if (config['INTEGRATED_AS'] == "yes"):
 				common['CC'] += " -integrated-as"
+				common['CXX'] += " -integrated-as"
 
 			if (config['INTEGRATED_AS'] == "no"):
 				common['CC'] += " -no-integrated-as"
+				common['CXX'] += " -no-integrated-as"
 
 		# Find full path to libgcc