From 90d3f9f2485e72613c09d081194bb1fba8a01d70 Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:03:03 -0400
Subject: [PATCH 1/2] tools.sh: remove Darwin workaround

---
 tools/tools.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tools/tools.sh b/tools/tools.sh
index a09ec6416..0625717bc 100644
--- a/tools/tools.sh
+++ b/tools/tools.sh
@@ -50,15 +50,6 @@ if [[ $PLATFORM == CYGWIN* ]]; then
   exit 1
 fi
 
-if [[ $PLATFORM == Darwin ]]; then
-  echo $PATH
-  CFLAGS_OPENSSL="$(pkg-config --cflags openssl)"
-  LDFLAGS_OPENSSL="$(pkg-config --libs-only-L openssl)"
-  export C_INCLUDE_PATH=${CFLAGS_OPENSSL:2}
-  export CPLUS_INCLUDE_PATH=${CFLAGS_OPENSSL:2}
-  export LIBRARY_PATH=${LDFLAGS_OPENSSL:2}
-fi
-
 function require()
 {
   if ! command -v $1 &>/dev/null; then

From 64d99dbb436b436680865a9ba7e272c1481d608c Mon Sep 17 00:00:00 2001
From: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:05:33 -0400
Subject: [PATCH 2/2] =?UTF-8?q?build.sh:=20Don=E2=80=99t=20build=20xar=20o?=
 =?UTF-8?q?n=20Darwin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using the macOS provided copy of xar avoids the need for openssl
---
 build.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index bbcff0cee..af680ffdf 100755
--- a/build.sh
+++ b/build.sh
@@ -92,8 +92,9 @@ if [ "$SDK_VERSION" != "$OLD_SDK_VERSION" ]; then
 fi
 
 # XAR
-
-build_xar
+if [[ $PLATFORM != Darwin ]]; then
+  build_xar
+fi
 
 # XAR END
 
@@ -128,7 +129,9 @@ if [ $f_res -eq 1 ]; then
   if [ $NEED_TAPI_SUPPORT -eq 1 ]; then
     CONFFLAGS+="--with-libtapi=$TARGET_DIR "
   fi
-  CONFFLAGS+="--with-libxar=$TARGET_DIR "
+  if [[ $PLATFORM != Darwin ]]; then
+    CONFFLAGS+="--with-libxar=$TARGET_DIR "
+  fi
   [ -n "$DISABLE_CLANG_AS" ] && CONFFLAGS+="--disable-clang-as "
   [ -n "$DISABLE_LTO_SUPPORT" ] && CONFFLAGS+="--disable-lto-support "
   ./configure $CONFFLAGS