diff options
| author | Chih-Wei Huang <[email protected]> | 2017-07-20 18:30:57 +0800 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2017-07-21 08:48:45 +0300 |
| commit | c1a29e104cc585ad3219b12d09f532a129d68dad (patch) | |
| tree | dd24502ddd51194fc735249ac045dfa2c1ad364b | |
| parent | b78563f0d07f44143021feeb1172c320a4f98bb6 (diff) | |
Android: fix spirv_info.c generation
It's incorrect to use $(LOCAL_PATH) in makefile recipes since it's
changing. The typical way to handle it is to use private variable.
Fortunately in this case we can just simplify them to $^.
See further:
https://patchwork.freedesktop.org/patch/167718/
Also simplify LOCAL_GENERATED_SOURCES.
Fixes: 2dd4e2ec (spirv: Generate spirv_info.c)
Signed-off-by: Chih-Wei Huang <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
| -rw-r--r-- | src/compiler/Android.nir.gen.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk index 4507ac4ba8c..e2187d081df 100644 --- a/src/compiler/Android.nir.gen.mk +++ b/src/compiler/Android.nir.gen.mk @@ -41,7 +41,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \ $(MESA_TOP)/src/compiler/nir LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(NIR_GENERATED_FILES)) + $(NIR_GENERATED_FILES) $(SPIRV_GENERATED_FILES)) # Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this MESA_GEN_NIR_H := $(addprefix $(call local-generated-sources-dir)/, \ @@ -95,9 +95,6 @@ $(intermediates)/nir/nir_opt_algebraic.c: $(nir_opt_algebraic_deps) @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(nir_opt_algebraic_gen) $< > $@ -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(SPIRV_GENERATED_FILES)) - $(intermediates)/spirv/spirv_info.c: $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json @mkdir -p $(dir $@) - $(hide) $(MESA_PYTHON2) $(LOCAL_PATH)/spirv/spirv_info_c.py $(LOCAL_PATH)/spirv/spirv.core.grammar.json $@ || ($(RM) $@; false) + $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false) |