diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12f53ffdf1..403b130e2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -464,7 +464,7 @@ build-retroarch-metal-osx-arm64:
   script:
     # Normal RetroArch Metal (ARM64) Build
     - ./configure --enable-metal --disable-al
-    - make ARCH=arm64 -j$NUMPROC
+    - make -j$NUMPROC
 
     # Cleanup for DMG creation
     - rm -rvf "RetroArch_ARM64.app/"
diff --git a/audio/drivers_resampler/cc_resampler.c b/audio/drivers_resampler/cc_resampler.c
index 698b8587cb..1128c1527e 100644
--- a/audio/drivers_resampler/cc_resampler.c
+++ b/audio/drivers_resampler/cc_resampler.c
@@ -29,6 +29,12 @@
 
 #include <audio/audio_resampler.h>
 
+#if (defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)) || defined(HAVE_NEON)
+#ifndef HAVE_ARM_NEON_OPTIMIZATIONS
+#define HAVE_ARM_NEON_OPTIMIZATIONS
+#endif
+#endif
+
 /* Since SSE and NEON don't provide support for trigonometric functions
  * we approximate those with polynoms
  *
@@ -344,7 +350,7 @@ static void resampler_CC_upsample(void *re_, struct resampler_data *data)
    data->output_frames = outp - (audio_frame_float_t*)data->data_out;
 }
 
-#elif defined (__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#elif defined(HAVE_ARM_NEON_OPTIMIZATIONS)
 
 #define CC_RESAMPLER_IDENT "NEON"
 
diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
index 801f81640f..7f785ebe5c 100644
--- a/libretro-common/audio/conversion/float_to_s16.c
+++ b/libretro-common/audio/conversion/float_to_s16.c
@@ -28,10 +28,16 @@
 #include <altivec.h>
 #endif
 
+#if (defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)) || defined(HAVE_NEON)
+#ifndef HAVE_ARM_NEON_OPTIMIZATIONS
+#define HAVE_ARM_NEON_OPTIMIZATIONS
+#endif
+#endif
+
 #include <features/features_cpu.h>
 #include <audio/conversion/float_to_s16.h>
 
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#if defined(HAVE_ARM_NEON_OPTIMIZATIONS)
 static bool float_to_s16_neon_enabled = false;
 void convert_float_s16_asm(int16_t *out, const float *in, size_t samples);
 #endif
@@ -91,7 +97,7 @@ void convert_float_to_s16(int16_t *out,
 
    samples = samples_in;
    i       = 0;
-#elif defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#elif defined(HAVE_ARM_NEON_OPTIMIZATIONS)
    if (float_to_s16_neon_enabled)
    {
       size_t aligned_samples = samples & ~7;
@@ -151,7 +157,7 @@ void convert_float_to_s16(int16_t *out,
  **/
 void convert_float_to_s16_init_simd(void)
 {
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#if defined(HAVE_ARM_NEON_OPTIMIZATIONS)
    unsigned cpu = cpu_features_get();
 
    if (cpu & RETRO_SIMD_NEON)
diff --git a/libretro-common/audio/conversion/s16_to_float.c b/libretro-common/audio/conversion/s16_to_float.c
index 9ea0cd72cb..fef03ee988 100644
--- a/libretro-common/audio/conversion/s16_to_float.c
+++ b/libretro-common/audio/conversion/s16_to_float.c
@@ -29,7 +29,13 @@
 #include <features/features_cpu.h>
 #include <audio/conversion/s16_to_float.h>
 
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#if (defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)) || defined(HAVE_NEON)
+#ifndef HAVE_ARM_NEON_OPTIMIZATIONS
+#define HAVE_ARM_NEON_OPTIMIZATIONS
+#endif
+#endif
+
+#if defined(HAVE_ARM_NEON_OPTIMIZATIONS)
 static bool s16_to_float_neon_enabled = false;
 
 /* Avoid potential hard-float/soft-float ABI issues. */
@@ -98,7 +104,7 @@ void convert_s16_to_float(float *out,
    samples = samples_in;
    i       = 0;
 
-#elif defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#elif defined(HAVE_ARM_NEON_OPTIMIZATIONS)
    if (s16_to_float_neon_enabled)
    {
       size_t aligned_samples = samples & ~7;
@@ -181,7 +187,7 @@ void convert_s16_to_float(float *out,
  **/
 void convert_s16_to_float_init_simd(void)
 {
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#if defined(HAVE_ARM_NEON_OPTIMIZATIONS)
    unsigned cpu = cpu_features_get();
 
    if (cpu & RETRO_SIMD_NEON)
diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler.c b/libretro-common/audio/resampler/drivers/sinc_resampler.c
index d3a9f7c6d4..2c3937e984 100644
--- a/libretro-common/audio/resampler/drivers/sinc_resampler.c
+++ b/libretro-common/audio/resampler/drivers/sinc_resampler.c
@@ -87,12 +87,14 @@ typedef struct rarch_sinc_resampler
    enum sinc_window window_type;
 } rarch_sinc_resampler_t;
 
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
+#if (defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)) || defined(HAVE_NEON)
 #if TARGET_OS_IPHONE
 #else
+#ifndef WANT_NEON
 #define WANT_NEON
 #endif
 #endif
+#endif
 
 #ifdef WANT_NEON
 /* Assumes that taps >= 8, and that taps is a multiple of 8. */