summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-10 17:18:35 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-10 17:18:35 (GMT)
commit1eda0e0025550acde2c0c9c937a29063227201b1 (patch)
treea8401714b4ae7e12c86b6b24113bb53ff9f7baa5 /3rdParty
parent2edf74915432242ba99e7820a7633a06c755c17b (diff)
downloadswift-1eda0e0025550acde2c0c9c937a29063227201b1.zip
swift-1eda0e0025550acde2c0c9c937a29063227201b1.tar.bz2
Migrated all configure flags to SCons.
Diffstat (limited to '3rdParty')
-rw-r--r--3rdParty/Boost/SConscript5
-rw-r--r--3rdParty/LibIDN/SConscript3
2 files changed, 7 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index d75ac29..769a67d 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -8,6 +8,9 @@ env["BOOST_FLAGS"] = {
"LIBS": ["Boost"]
}
+myenv = env.Clone()
+myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
+
sources = [
"libs/date_time/src/gregorian/date_generators.cpp",
"libs/date_time/src/gregorian/greg_month.cpp",
@@ -60,4 +63,4 @@ else :
if env["PLATFORM"] == "cygwin" :
env["BOOST_FLAGS"]["CPPDEFINES"] += ["__USE_W32_SOCKETS"]
-env.StaticLibrary("Boost", sources, CPPFLAGS = "-I" + Dir(".").abspath, CPPDEFINES = cppdefines)
+myenv.StaticLibrary("Boost", sources, CPPFLAGS = "-I" + Dir(".").abspath, CPPDEFINES = cppdefines)
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
index 7e134dd..9e408ff 100644
--- a/3rdParty/LibIDN/SConscript
+++ b/3rdParty/LibIDN/SConscript
@@ -9,6 +9,9 @@ env["LIBIDN_FLAGS"] = {
myenv = env.Clone()
+# Remove warn flags
+myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])
+
# Check for strcasecmp() or replacement
conf = Configure(myenv)
if not conf.CheckFunc('strcasecmp') :