From c20c50e6efc415d6234d03de07e7a5a2439f7ddf Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Mon, 7 Dec 2020 23:26:30 +0100 Subject: [PATCH] android: spirv: fix '::' typo in gen rules among all Android gen rules '::' was used only here to declare dependencies; mesa development and stable branch are worth receiving the fix Fixes the following building errors with Android 7: obj/STATIC_LIBRARIES/libmesa_nir_intermediates/spirv/gl_spirv.P:184: *** target file gen/STATIC_LIBRARIES/libmesa_nir_intermediates/spirv/vtn_generator_ids.h' has both : and :: entries. Stop. Cc: "20.3" Fixes: 1070bba19e26 ("android: fix SPIR-V -> NIR build") Reported-by: youling257 (cherry picked from commit 185df8ef07f92ae3e89b3aec912cc5259904ab50) --- .pick_status.json | 2 +- src/compiler/Android.nir.gen.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 93cc6a1a810..3df09aeeb7f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -679,7 +679,7 @@ "description": "android: spirv: fix '::' typo in gen rules", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "1070bba19e26640bc1dbfd04180e97217761404d" }, diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk index 2d2f7724c4e..1598261c7b4 100644 --- a/src/compiler/Android.nir.gen.mk +++ b/src/compiler/Android.nir.gen.mk @@ -100,11 +100,11 @@ $(intermediates)/spirv/spirv_info.c: $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) -$(intermediates)/spirv/vtn_gather_types.c:: $(LOCAL_PATH)/spirv/vtn_gather_types_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json +$(intermediates)/spirv/vtn_gather_types.c: $(LOCAL_PATH)/spirv/vtn_gather_types_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) -$(intermediates)/spirv/vtn_generator_ids.h:: $(LOCAL_PATH)/spirv/vtn_generator_ids_h.py $(LOCAL_PATH)/spirv/spir-v.xml +$(intermediates)/spirv/vtn_generator_ids.h: $(LOCAL_PATH)/spirv/vtn_generator_ids_h.py $(LOCAL_PATH)/spirv/spir-v.xml @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false)