SConstruct : Avoid matching clang with "g++" in basename(CXX)

Author: danieldresser

SConstruct

@@ -1110,7 +1110,7 @@ if env["PLATFORM"] != "win32" :
 			env.Append( CXXFLAGS = [ "-Wno-unused-local-typedef", "-Wno-deprecated-declarations" ] )
 
 	elif env["PLATFORM"]=="posix" :
-		if "g++" in os.path.basename( env["CXX"] ) :
+		if "g++" in os.path.basename( env["CXX"] ) and not "clang++" in os.path.basename( env["CXX"] ) :
 			gccVersion = subprocess.check_output( [ env["CXX"], "-dumpversion" ], env=env["ENV"], universal_newlines=True )
 			gccVersion = gccVersion.strip()
 			gccVersion = [ int( v ) for v in gccVersion.split( "." ) ]
@@ -1119,14 +1119,14 @@ if env["PLATFORM"] != "win32" :
 
 	env.Append( CXXFLAGS = [ "-std=$CXXSTD", "-fvisibility=hidden" ] )
 
-	if "g++" in os.path.basename( env["CXX"] ) :
-		# Turn off the parts of `-Wextra` that we don't like.
-		env.Append( CXXFLAGS = [ "-Wno-cast-function-type", "-Wno-unused-parameter" ] )
-
 	if "clang++" in os.path.basename( env["CXX"] ) :
 		# Turn off the parts of `-Wall` and `-Wextra` that we don't like.
 		env.Append( CXXFLAGS = ["-Wno-unused-local-typedef", "-Wno-unused-parameter"] )
 
+	elif "g++" in os.path.basename( env["CXX"] ) :
+		# Turn off the parts of `-Wextra` that we don't like.
+		env.Append( CXXFLAGS = [ "-Wno-cast-function-type", "-Wno-unused-parameter" ] )
+
 	if env["ASAN"] :
 		env.Append(
 			CXXFLAGS = [ "-fsanitize=address" ],