diff options
| author | Maciej Żenczykowski <maze@google.com> | 2023-04-27 22:00:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-27 22:00:10 +0000 |
| commit | 36f01fa231912f12e05158d63a45cfc29344be72 (patch) | |
| tree | 677f0bba9549aa25ab812627df9d50e0fea4053a | |
| parent | b7999b9f785e5420698f03d2d9b07b0a56b2ff22 (diff) | |
| parent | 831d27c1c8333464195f71521ac87ecf3c86b886 (diff) | |
| download | iproute2-36f01fa231912f12e05158d63a45cfc29344be72.tar.gz | |
Merge "Specify which M4 to use with bison" am: 7ef9147ba8 am: 2fada47f73 am: ea5cb79acb am: 831d27c1c8
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2566117
Change-Id: Ia39c3e99cc91e3ff12ddb6bed0dcf19fba328cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tc/Android.bp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tc/Android.bp b/tc/Android.bp index 1838acf7..9ff95619 100644 --- a/tc/Android.bp +++ b/tc/Android.bp @@ -41,18 +41,24 @@ genrule { genrule { name: "emp_ematch.yacc.c", - cmd: "$(location bison) -y --output=$(genDir)/emp_ematch.yacc.c $(in)", + cmd: "M4=$(location m4) $(location bison) -y --output=$(genDir)/emp_ematch.yacc.c $(in)", out: ["emp_ematch.yacc.c"], srcs: ["emp_ematch.y"], - tools: ["bison"], + tools: [ + "bison", + "m4", + ], } genrule { name: "emp_ematch.yacc.h", - cmd: "$(location bison) -y --defines=$(genDir)/emp_ematch.yacc.h --output=$(genDir)/emp_ematch.yacc.c $(in)", + cmd: "M4=$(location m4) $(location bison) -y --defines=$(genDir)/emp_ematch.yacc.h --output=$(genDir)/emp_ematch.yacc.c $(in)", out: ["emp_ematch.yacc.h"], srcs: ["emp_ematch.y"], - tools: ["bison"], + tools: [ + "bison", + "m4", + ], } cc_binary { |