Index: tools/autotool.py
===================================================================
--- tools/autotool.py	(revision 058c24037dbc8e5cacc5c491c765315ad0980b06)
+++ tools/autotool.py	(revision 8e2154e7a5f2efb72e5de559639e832fa5dd2d43)
@@ -323,9 +323,9 @@
 
 	common['GCC'] = "%sgcc" % prefix
-	common['GPP'] = "%sg++" % prefix
+	common['GXX'] = "%sg++" % prefix
 
 	if (not path is None):
 		common['GCC'] = "%s/%s" % (path, common['GCC'])
-		common['GPP'] = "%s/%s" % (path, common['GPP'])
+		common['GXX'] = "%s/%s" % (path, common['GXX'])
 
 	check_app([common['GCC'], "--version"], "GNU GCC", details)
@@ -616,6 +616,6 @@
 			common['CC_AUTOGEN'] = common['CC']
 
-			check_common(common, "GPP")
-			common['CPP'] = common['GPP']
+			check_common(common, "GXX")
+			common['CXX'] = common['GXX']
 
 		if (config['COMPILER'] == "gcc_native"):