diff options
| author | Alistair Delva <adelva@google.com> | 2023-05-16 22:31:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-16 22:31:12 +0000 |
| commit | 1cdb8c55a9ecbbd0fa4c01efe0adb70de65c6472 (patch) | |
| tree | cc8b7377de9fe3a48860bdcaef14d12cedb79c45 | |
| parent | 146ccaa5c6670e9ff0f9fc63566dd3ef23ca72c8 (diff) | |
| parent | 0860f0006cff34731353833f3645ed0fdeb4c55b (diff) | |
| download | mesa3d-1cdb8c55a9ecbbd0fa4c01efe0adb70de65c6472.tar.gz | |
Merge "Fixup freedren bison/lex usage" am: faebeb2e6b am: 6626f6c129 am: 2bde0a4861 am: 0d52478565 am: 0860f0006c
Original change: https://android-review.googlesource.com/c/platform/external/mesa3d/+/2573950
Change-Id: I43781671d891d8aea550551701d0474284910dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/freedreno/Android.ir3.mk | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 2d60be4ff40..575cf15619c 100644 --- a/Android.mk +++ b/Android.mk @@ -55,8 +55,10 @@ MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk MESA_PYTHON3 := python3 ifeq ($(filter 5 6 7 8 9 10, $(MESA_ANDROID_MAJOR_VERSION)),) MESA_LEX := M4=$(M4) $(LEX) +MESA_BISON := M4=$(M4) $(BISON) else MESA_LEX := $(LEX) +MESA_BISON := $(BISON) endif # Lists to convert driver names to boolean variables diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk index c46564e55af..a3059da5e47 100644 --- a/src/freedreno/Android.ir3.mk +++ b/src/freedreno/Android.ir3.mk @@ -78,8 +78,7 @@ ir3_parser_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$@ $< + $(hide) $(MESA_LEX) --nounistd -o$@ $< $(intermediates)/ir3/ir3_nir_imul.c: $(prebuilt_intermediates)/ir3/ir3_nir_imul.c cp -a $< $@ @@ -90,14 +89,12 @@ $(intermediates)/ir3/ir3_nir_trig.c: $(prebuilt_intermediates)/ir3/ir3_nir_trig. $(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=$@ + $(hide) $(MESA_BISON) $< --name-prefix=ir3_yy --output=$@ $(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=$@ --output=$@.tab.c - $(hide) M4=$(M4) $(BISON) $< --name-prefix=ir3_yy --defines=$@ --output=$@.tab.c + $(hide) $(MESA_BISON) $< --name-prefix=ir3_yy --defines=$@ --output=$@.tab.c include $(MESA_COMMON_MK) include $(BUILD_STATIC_LIBRARY) |