File tree Expand file tree Collapse file tree 3 files changed +22
-7
lines changed
buildconfig/macdependencies Expand file tree Collapse file tree 3 files changed +22
-7
lines changed Original file line number Diff line number Diff line change 24
24
matrix :
25
25
# make arm64 deps and x86_64 deps
26
26
include :
27
- - { macarch: arm64, os: macos-14 }
28
- - { macarch: x86_64, os: macos-13 }
27
+ - { macarch: arm64, os: macos-15 }
28
+ - { macarch: x86_64, os: macos-15 }
29
29
30
30
steps :
31
31
- uses : actions/checkout@v5.0.0
64
64
fail-fast : false # if a particular matrix build fails, don't skip the rest
65
65
matrix :
66
66
include :
67
- - { macarch: arm64, os: macos-14 }
68
- - { macarch: x86_64, os: macos-13 }
67
+ - { macarch: arm64, os: macos-15 }
68
+ - { macarch: x86_64, os: macos-15 }
69
69
70
70
env :
71
71
MAC_ARCH : ${{ matrix.macarch }}
Original file line number Diff line number Diff line change 49
49
# install NASM to generate optimised x86_64 libjpegturbo builds
50
50
brew install nasm
51
51
52
+ # for scripts using ./configure to make x86_64 binaries
53
+ export CC=" clang -target x86_64-apple-macos10.11"
54
+ export CXX=" clang++ -target x86_64-apple-macos10.11"
55
+
56
+ export PG_BASE_CONFIGURE_FLAGS=" $PG_BASE_CONFIGURE_FLAGS --host=x86_64-apple-darwin"
57
+
58
+ # configure cmake to cross-compile
59
+ export PG_BASE_CMAKE_FLAGS=" $PG_BASE_CMAKE_FLAGS -DCMAKE_OSX_ARCHITECTURES=x86_64"
60
+
52
61
# SDL 2.26.5 new minimum macos is 10.11, so we build our x86 mac deps
53
62
# for 10.11 as well.
54
63
export MACOSX_DEPLOYMENT_TARGET=10.11
55
64
56
- # needs native-file that has correct macosx deployment target
57
- export PG_BASE_MESON_FLAGS=" $PG_BASE_MESON_FLAGS --native -file $( pwd) /macos_x86_64.ini"
65
+ # configure meson to cross-compile with correct target
66
+ export PG_BASE_MESON_FLAGS=" $PG_BASE_MESON_FLAGS --cross -file $( pwd) /macos_x86_64.ini"
58
67
fi
59
68
60
69
cd ../manylinux-build/docker_base
Original file line number Diff line number Diff line change 1
1
[constants]
2
- macos_ver = [' -mmacosx-version-min=10.11' ]
2
+ macos_ver = [' -target' , ' x86_64-apple-macos10.11' ]
3
+
4
+ [host_machine]
5
+ system = ' darwin'
6
+ cpu_family = ' x86_64'
7
+ cpu = ' x86_64'
8
+ endian = ' little'
3
9
4
10
[binaries]
5
11
c = [' clang' ]
You can’t perform that action at this time.
0 commit comments