summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-04 09:54:10 (GMT)
committerTobias Markmann <tm@ayena.de>2015-05-04 09:54:10 (GMT)
commit430f8e3d2f7afac17f51d37bf502586dc2dc32cc (patch)
treef3eeafdf87551a4a8035c3b52151f4e108ecdc9a /BuildTools/SCons/SConstruct
parente53da0d1bc137df591fa4e97261a55daef8f2905 (diff)
downloadswift-430f8e3d2f7afac17f51d37bf502586dc2dc32cc.zip
swift-430f8e3d2f7afac17f51d37bf502586dc2dc32cc.tar.bz2
Correctly handle full paths when detecting Clang/GCC compilers
Test-Information: Tested behavior on Elementary OS 0.2.1. Change-Id: I887b85b78bfe5210844e0ea31f496fdbc8c21fa0
Diffstat (limited to 'BuildTools/SCons/SConstruct')
-rw-r--r--BuildTools/SCons/SConstruct2
1 files changed, 1 insertions, 1 deletions
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"] }