Browse Source

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

Signed-off-by: falkTX <falktx@falktx.com>
main
falkTX 5 months ago
parent
commit
b1fd593cdb
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 37 additions and 4 deletions
  1. +7
    -4
      setup/check_target.sh
  2. +15
    -0
      setup/meson/macos-10.15.ini
  3. +15
    -0
      setup/meson/macos.ini

+ 7
- 4
setup/check_target.sh View File

@@ -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:"


+ 15
- 0
setup/meson/macos-10.15.ini View File

@@ -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'

+ 15
- 0
setup/meson/macos.ini View File

@@ -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'

Loading…
Cancel
Save