diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-11 10:25:34 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:27 -0400 |
| commit | 9cc0e6e99ca3645b87c22fecdaa9ba9965a12e4f (patch) | |
| tree | d2983b55e3e36dd00095d1593b559a1effa9128d /src/basic | |
| parent | 3131bfe302d3d2657576499a86827ca979846b81 (diff) | |
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.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/generate-af-list.sh | 2 | ||||
| -rw-r--r-- | src/basic/generate-arphrd-list.sh | 2 | ||||
| -rw-r--r-- | src/basic/generate-cap-list.sh | 2 | ||||
| -rw-r--r-- | src/basic/generate-errno-list.sh | 2 | ||||
| -rw-r--r-- | src/basic/meson.build | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh index e4f9f68312..3fdfe2ea60 100644 --- a/src/basic/generate-af-list.sh +++ b/src/basic/generate-af-list.sh @@ -1,5 +1,5 @@ #!/bin/sh -cpp -dM -include sys/socket.h - </dev/null | \ +$1 -E -dM -include sys/socket.h - </dev/null | \ grep -Ev 'AF_UNSPEC|AF_MAX' | \ awk '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $2; }' diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh index e4cd8ab6d2..9911f315fa 100644 --- a/src/basic/generate-arphrd-list.sh +++ b/src/basic/generate-arphrd-list.sh @@ -1,5 +1,5 @@ #!/bin/sh -e -cpp -dM -include net/if_arp.h - </dev/null | \ +$1 -dM -include net/if_arp.h - </dev/null | \ awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \ sed -e 's/ARPHRD_//' diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh index de4b44661e..b79468cd59 100644 --- a/src/basic/generate-cap-list.sh +++ b/src/basic/generate-cap-list.sh @@ -1,5 +1,5 @@ #!/bin/sh -e -cpp -dM -include linux/capability.h -include "$1" -include "$2" - </dev/null | \ +$1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \ awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \ grep -v CAP_LAST_CAP diff --git a/src/basic/generate-errno-list.sh b/src/basic/generate-errno-list.sh index 291b118f36..a80990ac24 100644 --- a/src/basic/generate-errno-list.sh +++ b/src/basic/generate-errno-list.sh @@ -1,4 +1,4 @@ #!/bin/sh -e -cpp -dM -include errno.h - </dev/null | \ +$1 -dM -include errno.h - </dev/null | \ awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }' diff --git a/src/basic/meson.build b/src/basic/meson.build index 23caa1c7a5..17049481aa 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -206,28 +206,28 @@ generate_af_list = find_program('generate-af-list.sh') af_list_txt = custom_target( 'af-list.txt', output : 'af-list.txt', - command : [generate_af_list], + command : [generate_af_list, cpp], capture : true) generate_arphrd_list = find_program('generate-arphrd-list.sh') arphrd_list_txt = custom_target( 'arphrd-list.txt', output : 'arphrd-list.txt', - command : [generate_arphrd_list], + command : [generate_arphrd_list, cpp], capture : true) generate_cap_list = find_program('generate-cap-list.sh') cap_list_txt = custom_target( 'cap-list.txt', output : 'cap-list.txt', - command : [generate_cap_list, config_h, missing_h], + command : [generate_cap_list, cpp, config_h, missing_h], capture : true) generate_errno_list = find_program('generate-errno-list.sh') errno_list_txt = custom_target( 'errno-list.txt', output : 'errno-list.txt', - command : [generate_errno_list], + command : [generate_errno_list, cpp], capture : true) generated_gperf_headers = [] |