Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2016-06-03 15:02:01 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2016-07-05 15:05:36 (GMT) |
| commit | 7cef6f46bdd570cf0d4887336197723ae07a8097 (patch) | |
| tree | c706b90275b95082de54fb4231875b5646a0330a /BuildTools | |
| parent | 3fd85077d90e46b1dd8ea971bc1c9eeb3e56ff14 (diff) | |
| download | swift-7cef6f46bdd570cf0d4887336197723ae07a8097.zip swift-7cef6f46bdd570cf0d4887336197723ae07a8097.tar.bz2 | |
Update Debian building ready for shipping 3.0 to them
Change-Id: If42f50bf0ffbabee5e2c03fd99b3154362230189
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index dafd2b0..de24728 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -398,8 +398,7 @@ if env["experimental_ft"] : libminiupnpc_flags["CPPPATH"] = [env["libminiupnpc_includedir"]] libminiupnpc_conf_env.MergeFlags(libminiupnpc_flags) conf = Configure(libminiupnpc_conf_env) - if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) and False : - # ^ False because APIs aren't stable + if conf.CheckCHeader("miniupnpc.h") and conf.CheckLib(env["libminiupnpc_libname"]) : env["HAVE_LIBMINIUPNPC"] = 1 env["LIBMINIUPNPC_FLAGS"] = { "LIBS": ["miniupnpc"] } env["LIBMINIUPNPC_FLAGS"].update(libminiupnpc_flags) @@ -419,8 +418,7 @@ if env["experimental_ft"] : libnatpmp_flags["CPPPATH"] = [env["libnatpmp_includedir"]] libnatpmp_conf_env.MergeFlags(libnatpmp_flags) conf = Configure(libnatpmp_conf_env) - if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) and False: - # ^ False because APIs aren't stable + if conf.CheckCHeader("natpmp.h") and conf.CheckLib(env["libnatpmp_libname"]) : env["HAVE_LIBNATPMP"] = 1 env["LIBNATPMP_FLAGS"] = { "LIBS": ["natpmp"] } env["LIBNATPMP_FLAGS"].update(libnatpmp_flags) |