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/journal | |
| 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/journal')
| -rw-r--r-- | src/journal/generate-audit_type-list.sh | 6 | ||||
| -rw-r--r-- | src/journal/meson.build | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/journal/generate-audit_type-list.sh b/src/journal/generate-audit_type-list.sh index a8befbfea2..edd2b27994 100644 --- a/src/journal/generate-audit_type-list.sh +++ b/src/journal/generate-audit_type-list.sh @@ -1,10 +1,14 @@ #!/bin/sh -e +cpp="$1" +shift + includes="" for i in "$@"; do includes="$includes -include $i" done -cpp -dM $includes - </dev/null | \ + +$cpp -dM $includes - </dev/null | \ grep -vE 'AUDIT_.*(FIRST|LAST)_' | \ sed -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | \ sort -k2 diff --git a/src/journal/meson.build b/src/journal/meson.build index f06b564c19..360c52b92d 100644 --- a/src/journal/meson.build +++ b/src/journal/meson.build @@ -35,7 +35,7 @@ generate_audit_type_list = find_program('generate-audit_type-list.sh') audit_type_list_txt = custom_target( 'audit_type-list.txt', output : 'audit_type-list.txt', - command : [generate_audit_type_list] + audit_type_includes, + command : [generate_audit_type_list, cpp] + audit_type_includes, capture : true) audit_type_to_name = custom_target( |