From 971c25bcbecc211388d4c4afa896e7720dda09ae Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Sun, 26 Aug 2018 11:01:00 -0700
Subject: [PATCH] build:  Replace lingering instances of Options.platform

---
 contrib/wscript      | 2 +-
 src/internet/wscript | 2 +-
 wscript              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/wscript b/contrib/wscript
index 131715ae2..8d6313672 100644
--- a/contrib/wscript
+++ b/contrib/wscript
@@ -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:
diff --git a/src/internet/wscript b/src/internet/wscript
index 1763f683e..571afc86d 100644
--- a/src/internet/wscript
+++ b/src/internet/wscript
@@ -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
diff --git a/wscript b/wscript
index 20d290fc3..498772994 100644
--- a/wscript
+++ b/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