From 430f8e3d2f7afac17f51d37bf502586dc2dc32cc Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 4 May 2015 11:54:10 +0200
Subject: Correctly handle full paths when detecting Clang/GCC compilers

Test-Information:

Tested behavior on Elementary OS 0.2.1.

Change-Id: I887b85b78bfe5210844e0ea31f496fdbc8c21fa0

diff --git a/3rdParty/LibNATPMP/SConscript b/3rdParty/LibNATPMP/SConscript
index 273c2d2..2a58242 100644
--- a/3rdParty/LibNATPMP/SConscript
+++ b/3rdParty/LibNATPMP/SConscript
@@ -1,5 +1,7 @@
 Import(["env", "conf_env"])
 
+import os
+
 if env.get("LIBNATPMP_BUNDLED", False) :
 
 ################################################################################
@@ -12,7 +14,7 @@ if env.get("LIBNATPMP_BUNDLED", False) :
 				"LIBPATH": [Dir(".")],
 				"INTERNAL_CPPDEFINES": ["STATICLIB"],
 			}
-		if env["CC"] in ("clang", "gcc") :
+		if os.path.basename(env["CC"]) in ("clang", "gcc") :
 			env["LIBNATPMP_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibNATPMP/src/libnatpmp"]})
 		else :
 			env["LIBNATPMP_FLAGS"].update({"CPPPATH": [Dir("src/libnatpmp")]})
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 6813747..9fba359 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -298,7 +298,7 @@ if env.get("try_libxml", True) and not env.get("HAVE_LIBXML", 0) :
 #	and conf.CheckVersion("LibXML", "2.6.23", "LIBXML_VERSION", "libxml/xmlversion.h", 20623):
 		env["HAVE_LIBXML"] = 1
 		libxml_env.Append()
-		if env["CC"] in ("clang", "gcc"):
+		if os.path.basename(env["CC"]) in ("clang", "gcc"):
 			env["LIBXML_FLAGS"] = { "CXXFLAGS": ["-isystem/usr/include/libxml2"], "LIBS": ["xml2"] }
 		else:
 			env["LIBXML_FLAGS"] = { "CPPPATH": ["/usr/include/libxml2"], "LIBS": ["xml2"] }
-- 
cgit v0.10.2-6-g49f6