From 9cc0e6e99ca3645b87c22fecdaa9ba9965a12e4f Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 11 Apr 2017 10:25:34 -0400
Subject: meson: make cpp invocations cross-compilation friendly

This implementation assumes that the arguments in compiler.cmd_array()
don't contain any spaces. Since we are only interested in compilation
on Linux, I think this is a safe assumption.

Solution suggested by Nirbheek Chauhan.
---
 src/udev/generate-keyboard-keys-list.sh | 2 +-
 src/udev/meson.build                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/udev')

diff --git a/src/udev/generate-keyboard-keys-list.sh b/src/udev/generate-keyboard-keys-list.sh
index cd6ef9c93b..91635caebc 100644
--- a/src/udev/generate-keyboard-keys-list.sh
+++ b/src/udev/generate-keyboard-keys-list.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-cpp -dM -include linux/input.h - </dev/null | \
+$1 -dM -include linux/input.h - </dev/null | \
     awk '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($2 != "KEY_MAX") { print $2 } }'
diff --git a/src/udev/meson.build b/src/udev/meson.build
index dd8ec53cdf..fdd73046dc 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -58,7 +58,7 @@ generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh')
 keyboard_keys_list_txt = custom_target(
     'keyboard-keys-list.txt',
     output : 'keyboard-keys-list.txt',
-    command : [generate_keyboard_keys_list],
+    command : [generate_keyboard_keys_list, cpp],
     capture : true)
 
 fname = 'keyboard-keys-from-name.gperf'
-- 
cgit v1.2.3-54-g00ecf