diff options
author | Amit Pundir <amit.pundir@linaro.org> | 2020-11-03 12:08:46 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2021-03-01 23:55:33 +0530 |
commit | 56030461bbb78b295ddf2ab6427e9b1b146a0e20 (patch) | |
tree | 6115632a872b2c83e6525415f54ed8cc845b1134 | |
parent | fdeee97d553f7dcea1dd249dba1bc777f2c3a5c6 (diff) | |
download | mesa3d-56030461bbb78b295ddf2ab6427e9b1b146a0e20.tar.gz |
ANDROID: freedreno/Android.ir3.mk: Fixup usage of lex/yacc
Add M4 environment variable for flex so it uses our prebuilt instead
of the one in $PATH and add dependencies on the prebuilt executables
and data files for flex and bison.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: Ib289377a06b409cfabee8cbafe34ec2250941f8e
-rw-r--r-- | src/freedreno/Android.ir3.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk index a132bc76426..c4447892e01 100644 --- a/src/freedreno/Android.ir3.mk +++ b/src/freedreno/Android.ir3.mk @@ -72,10 +72,11 @@ ir3_nir_trig_deps := \ ir3_parser_deps := \ $(MESA_TOP)/src/freedreno/ir3/ir3_parser.y -$(intermediates)/ir3/ir3_lexer.c: $(ir3_lexer_deps) +$(intermediates)/ir3/ir3_lexer.c: $(ir3_lexer_deps) $(LEX) $(M4) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(MESA_LEX) -o $@ $< + $(hide) M4=$(M4) $(LEX) --nounistd -o$@ $< $(intermediates)/ir3/ir3_nir_imul.c: $(prebuilt_intermediates)/ir3/ir3_nir_imul.c cp -a $< $@ @@ -83,15 +84,17 @@ $(intermediates)/ir3/ir3_nir_imul.c: $(prebuilt_intermediates)/ir3/ir3_nir_imul. $(intermediates)/ir3/ir3_nir_trig.c: $(prebuilt_intermediates)/ir3/ir3_nir_trig.c cp -a $< $@ -$(intermediates)/ir3/ir3_parser.c: $(ir3_parser_deps) +$(intermediates)/ir3/ir3_parser.c: $(ir3_parser_deps) $(BISON) $(BISON_DATA) $(M4) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(BISON) $< --name-prefix=ir3_yy --output=$@ + $(hide) M4=$(M4) $(BISON) $< --name-prefix=ir3_yy --output=$@ -$(intermediates)/ir3/ir3_parser.h: $(ir3_parser_deps) +$(intermediates)/ir3/ir3_parser.h: $(ir3_parser_deps) $(BISON) $(BISON_DATA) $(M4) @mkdir -p $(dir $@) @echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(BISON) $< --name-prefix=ir3_yy --defines=$@ + $(hide) M4=$(M4) $(BISON) $< --name-prefix=ir3_yy --defines=$@ include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |