From d430fae05d970891f62201d71f885c502a50352e Mon Sep 17 00:00:00 2001
From: Ian McInerney <ian.s.mcinerney@ieee.org>
Date: Tue, 23 Mar 2021 21:44:34 +0000
Subject: [PATCH] OSX doesn't get the latest and greatest things

---
 common/build_version.cpp                 | 3 ++-
 common/dialog_about/AboutDialog_main.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/build_version.cpp b/common/build_version.cpp
index 200db246fe..1b2b8401ca 100644
--- a/common/build_version.cpp
+++ b/common/build_version.cpp
@@ -108,7 +108,8 @@ wxString GetVersionInfoData( const wxString& aTitle, bool aHtml, bool aBrief )
     aMsg << eol;
 
     aMsg << "Platform: " << wxGetOsDescription() << ", "
-#if wxCHECK_VERSION( 3, 1, 5 )
+// TODO (ISM): Remove OSX conditional once our wx fork is running released 3.1.5
+#if wxCHECK_VERSION( 3, 1, 5 ) && !defined( __WXOSX__  )
          << platform.GetBitnessName() << ", "
 #else
          << platform.GetArchName() << ", "
diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp
index 80f5aa7643..d15440da0f 100644
--- a/common/dialog_about/AboutDialog_main.cpp
+++ b/common/dialog_about/AboutDialog_main.cpp
@@ -100,7 +100,8 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
     wxPlatformInfo platformInfo;
 
     libVersion << "Platform: " << wxGetOsDescription() << ", "
-#if wxCHECK_VERSION( 3, 1, 5 )
+// TODO (ISM): Remove OSX conditional once our wx fork is running released 3.1.5
+#if wxCHECK_VERSION( 3, 1, 5 ) && !defined( __WXOSX__  )
     << platformInfo.GetBitnessName();
 #else
     << platformInfo.GetArchName();