summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-07-10 07:58:49 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-07-10 10:56:44 (GMT)
commit3911f30a92ae971aebdbf1d733b4261aafde4950 (patch)
treeeaa21ace7c329130b1aa5ab8b7494156d6eed4b9 /3rdParty
parent17721d86205828929e784ad35e5f07e8a7a71631 (diff)
downloadswift-3911f30a92ae971aebdbf1d733b4261aafde4950.zip
swift-3911f30a92ae971aebdbf1d733b4261aafde4950.tar.bz2
Fixed compilation problem on some compilers.
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/OpenSSL/.gitignore1
-rw-r--r--3rdParty/OpenSSL/SConscript2
2 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/OpenSSL/.gitignore b/3rdParty/OpenSSL/.gitignore
new file mode 100644
index 0000000..fa963ae
--- /dev/null
+++ b/3rdParty/OpenSSL/.gitignore
@@ -0,0 +1 @@
+openssl
diff --git a/3rdParty/OpenSSL/SConscript b/3rdParty/OpenSSL/SConscript
index c19632c..dfe78b7 100644
--- a/3rdParty/OpenSSL/SConscript
+++ b/3rdParty/OpenSSL/SConscript
@@ -1,6 +1,6 @@
Import("env")
-openssl_bundle_dir = "#/../openssl"
+openssl_bundle_dir = "openssl"
if env.get("OPENSSL_BUNDLED", False) :
if env["SCONS_STAGE"] == "flags" :