Skip to content

Commit 191cdbf

Browse files
white-axewhite-axe
committed
Specify CMake binary to fix cross builds with Meson 1.11.0
1 parent 19d99da commit 191cdbf

12 files changed

Lines changed: 18 additions & 0 deletions

‎.github/workflows/autobuild.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ jobs:
649649
echo "c = '${{ matrix.arch_gcc }}-gcc'" | tee -a ~/cross.ini
650650
echo "cpp = '${{ matrix.arch_gcc }}-g++'" | tee -a ~/cross.ini
651651
echo "ar = '${{ matrix.arch_gcc }}-ar'" | tee -a ~/cross.ini
652+
echo "cmake = 'cmake'" | tee -a ~/cross.ini
652653
echo "strip = '${{ matrix.arch_gcc }}-strip'" | tee -a ~/cross.ini
653654
echo "[host_machine]" | tee -a ~/cross.ini
654655
echo "system = 'windows'" | tee -a ~/cross.ini
@@ -803,6 +804,7 @@ jobs:
803804
echo "cpp_ld = 'lld'" | tee -a ${{ runner.temp }}/cross.ini
804805
echo "ar = 'llvm-ar'" | tee -a ${{ runner.temp }}/cross.ini
805806
echo "strip = 'llvm-strip'" | tee -a ${{ runner.temp }}/cross.ini
807+
echo "cmake = 'cmake'" | tee -a ${{ runner.temp }}/cross.ini
806808
echo "[host_machine]" | tee -a ${{ runner.temp }}/cross.ini
807809
echo "system = 'linux'" | tee -a ${{ runner.temp }}/cross.ini
808810
echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ${{ runner.temp }}/cross.ini
@@ -964,6 +966,7 @@ jobs:
964966
echo "cpp_ld = 'lld'" | tee -a ${{ runner.temp }}/cross.ini
965967
echo "ar = 'llvm-ar'" | tee -a ${{ runner.temp }}/cross.ini
966968
echo "strip = 'llvm-strip'" | tee -a ${{ runner.temp }}/cross.ini
969+
echo "cmake = 'cmake'" | tee -a ${{ runner.temp }}/cross.ini
967970
echo "[host_machine]" | tee -a ${{ runner.temp }}/cross.ini
968971
echo "system = 'linux'" | tee -a ${{ runner.temp }}/cross.ini
969972
echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ${{ runner.temp }}/cross.ini
@@ -1154,6 +1157,7 @@ jobs:
11541157
echo "cpp = ['${{ steps.ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++', '--target=${{ matrix.arch_llvm }}']" | tee -a ${{ runner.temp }}/cross.ini
11551158
echo "ar = '${{ steps.ndk.outputs.ndk-path }}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar'" | tee -a ${{ runner.temp }}/cross.ini
11561159
echo "strip = 'llvm-strip'" | tee -a ${{ runner.temp }}/cross.ini
1160+
echo "cmake = 'cmake'" | tee -a ${{ runner.temp }}/cross.ini
11571161
echo "[host_machine]" | tee -a ${{ runner.temp }}/cross.ini
11581162
echo "system = 'android'" | tee -a ${{ runner.temp }}/cross.ini
11591163
echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ${{ runner.temp }}/cross.ini
@@ -1228,6 +1232,7 @@ jobs:
12281232
echo "cpp = '${{ runner.temp }}/webos-sdk/bin/arm-webos-linux-gnueabi-g++'" | tee -a ${{ runner.temp }}/cross.ini
12291233
echo "ar = '${{ runner.temp }}/webos-sdk/bin/arm-webos-linux-gnueabi-ar'" | tee -a ${{ runner.temp }}/cross.ini
12301234
echo "strip = '${{ runner.temp }}/webos-sdk/bin/arm-webos-linux-gnueabi-strip'" | tee -a ${{ runner.temp }}/cross.ini
1235+
echo "cmake = 'cmake'" | tee -a ${{ runner.temp }}/cross.ini
12311236
echo "[host_machine]" | tee -a ${{ runner.temp }}/cross.ini
12321237
echo "system = 'linux'" | tee -a ${{ runner.temp }}/cross.ini
12331238
echo "cpu_family = 'arm'" | tee -a ${{ runner.temp }}/cross.ini
@@ -1332,6 +1337,7 @@ jobs:
13321337
echo "cpp = ['xcrun', '--sdk', '${{ matrix.sdk }}', 'clang++', '--target=${{ matrix.arch_llvm }}']" | tee -a ${{ runner.temp }}/cross.ini
13331338
echo "ar = 'ar'" | tee -a ${{ runner.temp }}/cross.ini
13341339
echo "strip = 'strip'" | tee -a ${{ runner.temp }}/cross.ini
1340+
echo "cmake = 'cmake'" | tee -a ${{ runner.temp }}/cross.ini
13351341
echo "[host_machine]" | tee -a ${{ runner.temp }}/cross.ini
13361342
echo "system = 'darwin'" | tee -a ${{ runner.temp }}/cross.ini
13371343
echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ${{ runner.temp }}/cross.ini
@@ -1408,6 +1414,7 @@ jobs:
14081414
echo "c = 'emcc'" | tee -a ${{ runner.temp }}/cross.ini
14091415
echo "cpp = 'em++'" | tee -a ${{ runner.temp }}/cross.ini
14101416
echo "ar = 'emar'" | tee -a ${{ runner.temp }}/cross.ini
1417+
echo "cmake = 'cmake'" | tee -a ${{ runner.temp }}/cross.ini
14111418
echo "[host_machine]" | tee -a ${{ runner.temp }}/cross.ini
14121419
echo "system = 'emscripten'" | tee -a ${{ runner.temp }}/cross.ini
14131420
echo "cpu_family = 'wasm32'" | tee -a ${{ runner.temp }}/cross.ini

‎Makefile.libretro‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ else ifeq ($(patsubst [%,,$(firstword $(MKXPZ_AR))),)
258258
else
259259
echo "ar = '$(MKXPZ_AR)'" >> $(MKXPZ_CROSS_FILE)
260260
endif
261+
echo "cmake = 'cmake'" >> $(MKXPZ_CROSS_FILE)
261262
echo "[host_machine]" >> $(MKXPZ_CROSS_FILE)
262263
echo "system = '$(MKXPZ_SYSTEM)'" >> $(MKXPZ_CROSS_FILE)
263264
echo "cpu_family = '$(MKXPZ_CPU_FAMILY)'" >> $(MKXPZ_CROSS_FILE)

‎libretro/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ To build a libretro core for a host machine that has a different operating syste
5353
c = '<path to host C compiler>'
5454
cpp = '<path to host C++ compiler>'
5555
ar = '<path to the ar program that creates static libraries for the host machine>'
56+
cmake = '<path to CMake binary>'
5657
[host_machine]
5758
system = '<see https://mesonbuild.com/Reference-tables.html#operating-system-names>'
5859
cpu_family = '<see https://mesonbuild.com/Reference-tables.html#cpu-families>'

‎libretro/meson-3ds.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
c = '/opt/devkitpro/devkitARM/bin/arm-none-eabi-gcc'
33
cpp = '/opt/devkitpro/devkitARM/bin/arm-none-eabi-g++'
44
ar = '/opt/devkitpro/devkitARM/bin/arm-none-eabi-ar'
5+
cmake = 'cmake'
56

67
[host_machine]
78
system = 'none'

‎libretro/meson-gcw0.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = '/opt/gcw0-toolchain/usr/bin/mipsel-linux-gcc'
33
cpp = '/opt/gcw0-toolchain/usr/bin/mipsel-linux-g++'
44
ar = 'ar'
55
strip = '/opt/gcw0-toolchain/usr/bin/mipsel-gcw0-linux-uclibc-strip'
6+
cmake = 'cmake'
67

78
[host_machine]
89
system = 'linux'

‎libretro/meson-miyoo.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = '/opt/miyoo/usr/bin/arm-linux-gcc'
33
cpp = '/opt/miyoo/usr/bin/arm-linux-g++'
44
ar = 'ar'
55
strip = '/opt/miyoo/usr/bin/arm-linux-strip'
6+
cmake = 'cmake'
67

78
[host_machine]
89
system = 'linux'

‎libretro/meson-ps3.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
c = 'ppu-gcc'
33
cpp = 'ppu-g++'
44
ar = 'ppu-ar'
5+
cmake = 'cmake'
56

67
[host_machine]
78
system = 'none'

‎libretro/meson-ps4.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
c = ['/usr/local/orbisdev/bin/clang', '-isystem/usr/local/orbisdev/usr/include']
33
cpp = ['/usr/local/orbisdev/bin/clang++', '-isystem/usr/local/orbisdev/usr/include/c++/v1', '-isystem/usr/local/orbisdev/usr/include']
44
ar = '/usr/local/orbisdev/bin/orbis-ar'
5+
cmake = 'cmake'
56

67
[host_machine]
78
system = 'none'

‎libretro/meson-retrofw.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ c = '/opt/retrofw-toolchain/usr/bin/mipsel-linux-gcc'
33
cpp = '/opt/retrofw-toolchain/usr/bin/mipsel-linux-g++'
44
ar = 'ar'
55
strip = '/opt/retrofw-toolchain/usr/bin/mipsel-linux-strip'
6+
cmake = 'cmake'
67

78
[host_machine]
89
system = 'linux'

‎libretro/meson-switch.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
c = '/opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc'
33
cpp = '/opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++'
44
ar = '/opt/devkitpro/devkitA64/bin/aarch64-none-elf-ar'
5+
cmake = 'cmake'
56

67
[host_machine]
78
system = 'none'

0 commit comments

Comments
 (0)