Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2017-06-26 03:57:43 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2017-06-26 08:15:04 (GMT) |
| commit | 96528818b201c5a250701b58bb9c4d11048b237e (patch) | |
| tree | e0685e693f4adacf5bab77357ab0b6b3353d126e /BuildTools/SCons | |
| parent | bd0e671455f6b042bbbd385f1551e9a5011badf5 (diff) | |
| download | swift-96528818b201c5a250701b58bb9c4d11048b237e.zip swift-96528818b201c5a250701b58bb9c4d11048b237e.tar.bz2 | |
Fix compiler warnings raise by Clang on Linux
Clang raises warnings about unused members and
macros on Linux. These are fixed with this change.
Test-Information:
Tested with clang-3.9 on Debian Stretch.
Change-Id: I87bc0606cfd14365330aaad4ed433d3bca2d5330
Diffstat (limited to 'BuildTools/SCons')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index a7e2bed..2c2d629 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -268,6 +268,9 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] if conf.CheckPKG("gconf-2.0") : gconf_bare_env = Environment() gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0') + if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) : + gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]] + gconf_bare_env["CPPPATH"] = [] gconf_flags = { "LIBS": gconf_bare_env["LIBS"], "CCFLAGS": gconf_bare_env["CCFLAGS"], @@ -280,7 +283,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"] env["GCONF_FLAGS"] = { "LIBS": gconf_env["LIBS"], "CCFLAGS": gconf_env["CCFLAGS"], - "CPPPATH": gconf_env["CPPPATH"], + "CPPPATH": gconf_env.get("CPPPATH", []), "CPPDEFINES": gconf_env.get("CPPDEFINES", []), } conf.Finish() |