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

build: Replace lingering instances of Options.platform

Browse Source
This commit is contained in:
Tom Henderson
2018-08-26 11:01:00 -07:00
parent 8ccb787371
commit 971c25bcbe
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wscript
View File

@@ -423,7 +423,7 @@ def configure(conf):
# bug 2181 on clang warning suppressions
if conf.env['CXX_NAME'] in ['clang']:
if Options.platform == 'darwin':
if Utils.unversioned_sys_platform() == 'darwin':
if 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:
@@ -435,7 +435,7 @@ def configure(conf):
env.append_value('CXXFLAGS', '-Wno-potentially-evaluated-expression')
env['ENABLE_STATIC_NS3'] = False
if Options.options.enable_static:
if Options.platform == 'darwin':
if Utils.unversioned_sys_platform() == 'darwin':
if conf.check_compilation_flag(flag=[], linkflags=['-Wl,-all_load']):
conf.report_optional_feature("static", "Static build", True, '')
env['ENABLE_STATIC_NS3'] = True