build: Replace lingering instances of Options.platform
This commit is contained in:
@@ -233,7 +233,7 @@ def ns3_python_bindings(bld):
|
||||
pymod.env.append_value('LINKFLAGS', '-Wl,-Bdynamic,--no-whole-archive')
|
||||
defines = list(pymod.env['DEFINES'])
|
||||
defines.extend(['NS_DEPRECATED=', 'NS3_DEPRECATED_H'])
|
||||
if Options.platform == 'win32':
|
||||
if Utils.unversioned_sys_platform() == 'win32':
|
||||
try:
|
||||
defines.remove('_DEBUG') # causes undefined symbols on win32
|
||||
except ValueError:
|
||||
|
||||
@@ -67,7 +67,7 @@ def configure(conf):
|
||||
"NSC not found (see option --with-nsc)")
|
||||
return
|
||||
|
||||
if Options.platform in ['linux', 'freebsd']:
|
||||
if Utils.unversioned_sys_platform() in ['linux', 'freebsd']:
|
||||
arch = os.uname()[4]
|
||||
else:
|
||||
arch = None
|
||||
|
||||
4
wscript
4
wscript
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user