Set CROSS_COMPILING=1 if building for macos-intel on arm64

Signed-off-by: falkTX <[email protected]>
DISTRHO · Nov 10, 2024 · b1fd593 · b1fd593
1 parent baf5a75
commit b1fd593
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/setup/check_target.sh b/setup/check_target.sh
@@ -23,18 +23,24 @@ function check_target() {
         "Darwin")
             CLANG=1
             MACOS=1
-            if [ "$(uname -m)" = "x86_64" ]; then
+            if [ "$(uname -m)" = "arm64" ]; then
                 MACOS_UNIVERSAL=1
             fi
             ;;
         "macos"|"macos-intel")
             CLANG=1
             MACOS=1
+            if [ "$(uname -m)" = "arm64" ]; then
+                CROSS_COMPILING=1
+            fi
             ;;
         "macos-10.15")
             CLANG=1
             MACOS=1
             MACOS_10_15=1
+            if [ "$(uname -m)" = "arm64" ]; then
+                CROSS_COMPILING=1
+            fi
             ;;
         "macos-universal")
             CLANG=1
@@ -166,9 +172,6 @@ function check_target() {
         "native")
             target=$(uname -s)
             check_target
-            if [ "${target}" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then
-                MACOS_UNIVERSAL=1
-            fi
             ;;
         default|*)
             echo "Invalid target '${target}', possible values are:"

diff --git a/setup/meson/macos-10.15.ini b/setup/meson/macos-10.15.ini
@@ -0,0 +1,15 @@
+[binaries]
+name = 'macos-10.15'
+c = 'gcc'
+cpp = 'g++'
+ar = 'ar'
+nm = 'nm'
+ld = 'ld'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'macos'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
diff --git a/setup/meson/macos.ini b/setup/meson/macos.ini
@@ -0,0 +1,15 @@
+[binaries]
+name = 'macos'
+c = 'gcc'
+cpp = 'g++'
+ar = 'ar'
+nm = 'nm'
+ld = 'ld'
+strip = 'strip'
+pkgconfig = 'pkg-config'
+
+[host_machine]
+system = 'macos'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'