From 93d8ffddb3a3d8f75337f7f24d8c758b03d79416 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Mon, 2 May 2022 17:59:05 +0930 Subject: [PATCH] meson: Older meson won't concatenate options https://github.com/mesonbuild/meson/issues/3878 Fixes errors such as: ERROR: Malformed value in cross file variable c. Remove the pkg-config cross binary, as distros don't ship that AFAICT. Signed-off-by: Joel Stanley --- meson/arm-buildroot-linux-gnueabi-gcc.ini | 12 ++++-------- meson/arm-linux-gnueabi-gcc.ini | 12 ++++-------- meson/arm-linux-gnueabihf-gcc.ini | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/meson/arm-buildroot-linux-gnueabi-gcc.ini b/meson/arm-buildroot-linux-gnueabi-gcc.ini index 0661a56..0b33090 100644 --- a/meson/arm-buildroot-linux-gnueabi-gcc.ini +++ b/meson/arm-buildroot-linux-gnueabi-gcc.ini @@ -4,13 +4,9 @@ cpu_family = 'arm' cpu = 'armv6' endian = 'little' -[constants] -arch = 'arm-buildroot-linux-gnueabi' - [binaries] -c = arch + '-gcc' -cpp = arch + '-g++' -ld = arch + '-ld' -strip = arch + '-strip' -pkgconfig = arch + '-pkg-config' +c = 'arm-buildroot-linux-gnueabi-gcc' +cpp = 'arm-buildroot-linux-gnueabi-g++' +ld = 'arm-buildroot-linux-gnueabi-ld' +strip = 'arm-buildroot-linux-gnueabi-strip' exe_wrapper = [ 'qemu-arm', '-L', '/usr/arm-linux-gnueabi' ] diff --git a/meson/arm-linux-gnueabi-gcc.ini b/meson/arm-linux-gnueabi-gcc.ini index 514d187..ca596ea 100644 --- a/meson/arm-linux-gnueabi-gcc.ini +++ b/meson/arm-linux-gnueabi-gcc.ini @@ -4,13 +4,9 @@ cpu_family = 'arm' cpu = 'armv6' endian = 'little' -[constants] -arch = 'arm-linux-gnueabi' - [binaries] -c = arch + '-gcc' -cpp = arch + '-g++' -ld = arch + '-ld' -strip = arch + '-strip' -pkgconfig = arch + '-pkg-config' +c = 'arm-linux-gnueabi-gcc' +cpp = 'arm-linux-gnueabi-g++' +ld = 'arm-linux-gnueabi-ld' +strip = 'arm-linux-gnueabi-strip' exe_wrapper = [ 'qemu-arm', '-L', '/usr/arm-linux-gnueabi' ] diff --git a/meson/arm-linux-gnueabihf-gcc.ini b/meson/arm-linux-gnueabihf-gcc.ini index 0d3c412..a58a2ff 100644 --- a/meson/arm-linux-gnueabihf-gcc.ini +++ b/meson/arm-linux-gnueabihf-gcc.ini @@ -4,13 +4,9 @@ cpu_family = 'arm' cpu = 'armv7' endian = 'little' -[constants] -arch = 'arm-linux-gnueabihf' - [binaries] -c = arch + '-gcc' -cpp = arch + '-g++' -ld = arch + '-ld' -strip = arch + '-strip' -pkgconfig = arch + '-pkg-config' +c = 'arm-linux-gnueabihf-gcc' +cpp = 'arm-linux-gnueabihf-g++' +ld = 'arm-linux-gnueabihf-ld' +strip = 'arm-linux-gnueabihf-strip' exe_wrapper = [ 'qemu-arm', '-L', '/usr/arm-linux-gnueabihf' ]