summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2018-01-05 14:57:54 (GMT)
committerTobias Markmann <tm@ayena.de>2018-01-29 14:15:19 (GMT)
commit1f70a58280db165c0df80c81b41986f1d67c0a95 (patch)
tree821e5b6d5e95ac0708d2dc78cc3c96824e875ec5
parentc5ff3704a693292c578a5b07d1604e522d70c6a7 (diff)
downloadswift-1f70a58280db165c0df80c81b41986f1d67c0a95.zip
swift-1f70a58280db165c0df80c81b41986f1d67c0a95.tar.bz2
Mark OpenSSL headers as system includes
This avoids warnings in code out of our control. Test-Information: Less warnings are emitted on macOS 10.13.2 with clang trunk. Change-Id: Ie5f28743000e5a7865fea9677e4429ab0543e378
-rw-r--r--3rdParty/OpenSSL/SConscript7
1 files changed, 6 insertions, 1 deletions
diff --git a/3rdParty/OpenSSL/SConscript b/3rdParty/OpenSSL/SConscript
index c95ea05..6e114e4 100644
--- a/3rdParty/OpenSSL/SConscript
+++ b/3rdParty/OpenSSL/SConscript
@@ -2,10 +2,15 @@ Import("env", "conf_env")
openssl_bundle_dir = "openssl"
+if env["PLATFORM"] == "win32" :
+ systemIncludeFlag = "/I"
+else:
+ systemIncludeFlag = "-isystem"
+
if env.get("OPENSSL_BUNDLED", False) :
if env["SCONS_STAGE"] == "flags" :
env["OPENSSL_FLAGS"] = {
- "CPPPATH": [Dir(openssl_bundle_dir + "/include")],
+ "CCFLAGS": [systemIncludeFlag + Dir(openssl_bundle_dir + "/include").abspath],
"LIBPATH": [Dir(".")],
"LIBS": ["ssl", "crypto"]
}