meson: Older meson won't concatenate options

mesonbuild/meson#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 <[email protected]>
shenki · May 2, 2022 · b6cb2b5 · b6cb2b5
1 parent d610d0a
commit b6cb2b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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' ]