From 6dacdef9fb5e58e8282475624f9c1aaf9e6d6fa1 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Mon, 21 Sep 2020 05:17:19 +0100
Subject: [PATCH] Tweaks for a proper macOS 10.12 build

---
 data/macos/build-deps-new.sh            | 5 +++++
 data/macos/build.sh                     | 4 ++--
 data/patches/qt59-osx10.12-compat.patch | 0
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 data/patches/qt59-osx10.12-compat.patch

diff --git a/data/macos/build-deps-new.sh b/data/macos/build-deps-new.sh
index 4e0a151a9..636922df0 100755
--- a/data/macos/build-deps-new.sh
+++ b/data/macos/build-deps-new.sh
@@ -337,6 +337,11 @@ fi
 
 # cleanup
 
+if [ $(clang -v  2>&1 | grep version | cut -d' ' -f4 | cut -d'.' -f1) -lt 11 ]; then
+  export ARCH=32
+  build_base
+fi
+
 export ARCH=64
 build_base
 
diff --git a/data/macos/build.sh b/data/macos/build.sh
index d890e041d..45a1e8419 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -20,7 +20,7 @@ fi
 
 source data/macos/common.env
 
-if [ $(clang -v  2>&1 | grep version | cut -d' ' -f4 | cut -d'.' -f1) -lt 11 ]; then
+if [ $(uname -r | cut -d '.' -f 1) -lt 16 ]; then
   export MACOS_VERSION_MIN="10.8"
 else
   export MACOS_VERSION_MIN="10.12"
@@ -54,7 +54,7 @@ make USING_JUCE=${USING_JUCE} USING_JUCE_AUDIO_DEVICES=${USING_JUCE} ${MAKE_ARGS
 ##############################################################################################
 # Build 32bit bridges
 
-if [ "${MACOS_VERSION_MIN}" != "10.12" ]; then
+if [ $(clang -v  2>&1 | grep version | cut -d' ' -f4 | cut -d'.' -f1) -lt 11 ]; then
 
 export CFLAGS="-I${TARGETDIR}/carla32/include -m32 -mmacosx-version-min=${MACOS_VERSION_MIN}"
 export CXXFLAGS="${CFLAGS} -stdlib=libc++ -Wno-unknown-pragmas -Wno-unused-private-field -Werror=auto-var-id"
diff --git a/data/patches/qt59-osx10.12-compat.patch b/data/patches/qt59-osx10.12-compat.patch
new file mode 100644
index 000000000..e69de29bb