Mesa (staging/20.2): android: spirv: fix '::' typo in gen rules

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: 7665dc409c1f77c60b45ea4a95a51926fc44134f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7665dc409c1f77c60b45ea4a95a51926fc44134f

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Mon Dec  7 23:26:30 2020 +0100

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" <mesa-stable at lists.freedesktop.org>
Fixes: 1070bba19e26 ("android: fix SPIR-V -> NIR build")
Reported-by: youling257 <youling257 at gmail.com>
(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 a9ae8f3aeca..f7369695de0 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)