commit 38dc09d39a815558eed9d9ae88b1ce3caa65461f
author Dan Willemsen <dwillemsen@google.com> Wed Jan 08 22:31:12 2020 -0800
committer Dan Willemsen <dwillemsen@google.com> Wed Jan 08 22:31:12 2020 -0800
tree bf7d66535ed1353cc4dd6389c6091ee500266733
parent 3801c82e331444daa1972fce296e1f913ded130b

Use our prebuilt M4 for flex and bison

And ensure we've got all the proper dependencies.

Bug: 117561006
Test: treehugger
Change-Id: Ia9690b2c0d73a48744c8e33fe83196d02b1e904d

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index ff435e2..49747ed 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -889,7 +889,7 @@
 define transform-l-to-c-or-cpp
 @echo "Lex: $(PRIVATE_MODULE) <= $<"
 @mkdir -p $(dir $@)
-$(hide) $(LEX) -o$@ $<
+M4=$(M4) $(LEX) -o$@ $<
 endef
 
 ###########################################################
@@ -900,7 +900,7 @@
 define transform-y-to-c-or-cpp
 @echo "Yacc: $(PRIVATE_MODULE) <= $<"
 @mkdir -p $(dir $@)
-$(YACC) $(PRIVATE_YACCFLAGS) \
+M4=$(M4) $(YACC) $(PRIVATE_YACCFLAGS) \
   --defines=$(basename $@).h \
   -o $@ $<
 endef