F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: (fixes #2181) Compare tuples numerically

Browse Source
This commit is contained in:
Tommaso Pecorella
2018-09-20 21:17:26 -07:00
parent 96b8d1d7a5
commit 1e922186d1
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wscript
View File

@@ -36,10 +36,10 @@ gcc_min_version = (4, 9, 2)
# Bug 2181: clang warnings about unused local typedefs and potentially
# evaluated expressions affecting darwin clang/LLVM version 7.0.0 (Xcode 7)
# or clang/LLVM version 3.6 or greater. We must make this platform-specific.
darwin_clang_version_warn_unused_local_typedefs = ('7', '0', '0')
darwin_clang_version_warn_potentially_evaluated = ('7', '0', '0')
clang_version_warn_unused_local_typedefs = ('3', '6', '0')
clang_version_warn_potentially_evaluated = ('3', '6', '0')
darwin_clang_version_warn_unused_local_typedefs = (7, 0, 0)
darwin_clang_version_warn_potentially_evaluated = (7, 0, 0)
clang_version_warn_unused_local_typedefs = (3, 6, 0)
clang_version_warn_potentially_evaluated = (3, 6, 0)
# Get the information out of the NS-3 configuration file.
config_file_exists = False
@@ -424,14 +424,14 @@ def configure(conf):
# bug 2181 on clang warning suppressions
if conf.env['CXX_NAME'] in ['clang']:
if Utils.unversioned_sys_platform() == 'darwin':
if conf.env['CC_VERSION'] >= darwin_clang_version_warn_unused_local_typedefs:
if tuple(map(int, conf.env['CC_VERSION'])) >= darwin_clang_version_warn_unused_local_typedefs:
env.append_value('CXXFLAGS', '-Wno-unused-local-typedefs')
if conf.env['CC_VERSION'] >= darwin_clang_version_warn_potentially_evaluated:
if tuple(map(int, conf.env['CC_VERSION'])) >= darwin_clang_version_warn_potentially_evaluated:
env.append_value('CXXFLAGS', '-Wno-potentially-evaluated-expression')
else:
if conf.env['CC_VERSION'] >= clang_version_warn_unused_local_typedefs:
if tuple(map(int, conf.env['CC_VERSION'])) >= clang_version_warn_unused_local_typedefs:
env.append_value('CXXFLAGS', '-Wno-unused-local-typedefs')
if conf.env['CC_VERSION'] >= clang_version_warn_potentially_evaluated:
if tuple(map(int, conf.env['CC_VERSION'])) >= clang_version_warn_potentially_evaluated:
env.append_value('CXXFLAGS', '-Wno-potentially-evaluated-expression')
env['ENABLE_STATIC_NS3'] = False
if Options.options.enable_static: