diff options
| author | John Stultz <[email protected]> | 2019-07-03 22:37:45 +0000 |
|---|---|---|
| committer | John Stultz <[email protected]> | 2019-08-07 02:18:19 +0000 |
| commit | 96baf052b2001bb9adf8d7eced411cd124060384 (patch) | |
| tree | d0e985b6bc118d0805e834047a743a887c241014 | |
| parent | 16edd56fccad7ba0e1b938a60f0f5e927a104585 (diff) | |
mesa: Add ir3/ir3_nir_imul.c generation to Android.mk
With current master we're seeing build failures with AOSP:
error: undefined symbol: ir3_nir_lower_imul
This is due to the ir3_nir_imul.c file not being generated
in the Android.mk files.
This patch simply adds it to the Android build, after which
thigns build and book ok on db410c.
Cc: Rob Clark <[email protected]>
Cc: Emil Velikov <[email protected]>
Cc: Amit Pundir <[email protected]>
Cc: Sumit Semwal <[email protected]>
Cc: Alistair Strachan <[email protected]>
Cc: Greg Hartman <[email protected]>
Cc: Tapani Pälli <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Signed-off-by: John Stultz <[email protected]>
| -rw-r--r-- | src/freedreno/Makefile.sources | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/Android.gen.mk | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources index 5b983266a62..cf3ac7bdba4 100644 --- a/src/freedreno/Makefile.sources +++ b/src/freedreno/Makefile.sources @@ -48,4 +48,5 @@ ir3_SOURCES := \ ir3/ir3_sun.c ir3_GENERATED_FILES := \ - ir3/ir3_nir_trig.c + ir3/ir3_nir_trig.c \ + ir3/ir3_nir_imul.c diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk index d29ba159d5c..21ee52b7e33 100644 --- a/src/gallium/drivers/freedreno/Android.gen.mk +++ b/src/gallium/drivers/freedreno/Android.gen.mk @@ -28,11 +28,19 @@ ir3_nir_trig_deps := \ $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ $(MESA_TOP)/src/compiler/nir/nir_algebraic.py +ir3_nir_imul_deps := \ + $(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \ + $(MESA_TOP)/src/compiler/nir/nir_algebraic.py + intermediates := $(call local-generated-sources-dir) $(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps) @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ +$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@ + LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ $(ir3_GENERATED_FILES)) |