summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Config')
-rw-r--r--Swiften/Config/SConscript5
-rw-r--r--Swiften/Config/swiften-config.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/Swiften/Config/SConscript b/Swiften/Config/SConscript
index 691e9e5..27dfc2e 100644
--- a/Swiften/Config/SConscript
+++ b/Swiften/Config/SConscript
@@ -20,7 +20,10 @@ swiften_env = env.Clone()
swiften_env.UseFlags(swiften_env["SWIFTEN_FLAGS"])
swiften_env.UseFlags(swiften_env["SWIFTEN_DEP_FLAGS"])
-cppflags = replaceSwiftenPath(" ".join([swiften_env.subst("$_CPPDEFFLAGS"), swiften_env.subst("$_CPPINCFLAGS")]))
+cppflags = replaceSwiftenPath(" ".join([
+ swiften_env.subst("$CPPFLAGS").replace("-isystem ","-I"),
+ swiften_env.subst("$_CPPDEFFLAGS"),
+ swiften_env.subst("$_CPPINCFLAGS")]))
config_flags += cStringVariable(swiften_env, "CPPFLAGS", cppflags)
libflags = replaceSwiftenPath(" ".join([
diff --git a/Swiften/Config/swiften-config.cpp b/Swiften/Config/swiften-config.cpp
index de07d74..89df9cd 100644
--- a/Swiften/Config/swiften-config.cpp
+++ b/Swiften/Config/swiften-config.cpp
@@ -118,7 +118,7 @@ int main(int argc, char* argv[]) {
if (vm.count("libs") > 0) {
printFlags(libs);
}
- else if (vm.count("cflags") > 0) {
+ if (vm.count("cflags") > 0) {
printFlags(cflags);
}
return 0;