From 3ff9264c52ab6d051b7e96d24cee9d54df269649 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 26 Dec 2020 00:42:25 +0000
Subject: [PATCH] Keep some little glib2 optimizations on for universal builds

---
 bootstrap-plugins.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
index 9f32c33..81f2f3d 100755
--- a/bootstrap-plugins.sh
+++ b/bootstrap-plugins.sh
@@ -78,8 +78,8 @@ if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
         patch_file glib ${GLIB_VERSION} "glib/gconvert.c" '/#error/g'
 
         if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
-            patch_file glib ${GLIB_VERSION} "glib/gatomic.c" 's/G_ATOMIC_ARM/G_ATOMIC_NOT_ARM/'
-            patch_file glib ${GLIB_VERSION} "glib/gatomic.c" 's/G_ATOMIC_X86_64/G_ATOMIC_NOT_X86_64/'
+            patch_file glib ${GLIB_VERSION} "glib/gatomic.c" 's/G_ATOMIC_ARM/__aarch64__/'
+            patch_file glib ${GLIB_VERSION} "glib/gatomic.c" 's/G_ATOMIC_X86_64/__SSE2__/'
         elif [ "${MACOS_OLD}" -eq 1 ]; then
             GLIB_EXTRAFLAGS+=" glib_cv_stack_grows=yes"
             GLIB_EXTRAFLAGS+=" glib_cv_rtldglobal_broken=no"
@@ -133,7 +133,7 @@ build_waf lilv "${LILV_VERSION}" "--static --no-bash-completion --no-bindings --
 # ---------------------------------------------------------------------------------------------------------------------
 # lv2lint
 
-if [ "${MACOS_OLD}" -ne 1 ] && [ "${CROSS_COMPILING}" -eq 0 ]; then
+if [ "${MACOS_OLD}" -eq 0 ] && [ "${CROSS_COMPILING}" -eq 0 ]; then
     download lv2lint "${LV2LINT_VERSION}" "https://gitlab.com/OpenMusicKontrollers/lv2lint/-/archive/${LV2LINT_VERSION}"
     build_meson lv2lint "${LV2LINT_VERSION}"
     # "-Donline-tests=true -Delf-tests=true"