diff options
| author | Marijn Suijten <marijns95@gmail.com> | 2020-10-21 00:26:46 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-10-23 17:34:31 +0000 |
| commit | f21dd3bc5a06e700988926522f81727efde7123c (patch) | |
| tree | 9142d229e59395f026544b0ee396fc2751acba1f | |
| parent | 3ba786f6243ec4e4dcca9a568c4231f492209f1a (diff) | |
scons: gallium/auxiliary: Unconditionally compile NIR regardless of LLVM
NIR sources are not depending on LLVM (anymore?) as can be seen in the
equivalent unconditional inclusion of nir/ source files in meson.build.
Symbols in these files are necessary to compile softpipe:
Linking build/linux-x86_64-debug/gallium/targets/libgl-xlib/libGL.so.1.5 ...
/usr/bin/ld: build/linux-x86_64-debug/gallium/drivers/softpipe/libsoftpipe.a(sp_state_shader.os): in function `softpipe_create_shader_state':
src/gallium/drivers/softpipe/sp_state_shader.c:146: undefined reference to `nir_to_tgsi'
/usr/bin/ld: build/linux-x86_64-debug/gallium/drivers/softpipe/libsoftpipe.a(sp_state_shader.os): in function `softpipe_create_compute_state':
src/gallium/drivers/softpipe/sp_state_shader.c:435: undefined reference to `nir_to_tgsi'
Fixes: fa483d8cd1b ("android: gallium/auxiliary: Deduplicate nir_to_tgsi.c inclusion")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3669
Tested-by: Vinson Lee <vlee@freedesktop.org>
Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7250>
| -rw-r--r-- | src/gallium/auxiliary/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript index cba4e3f7a71..6488bb36513 100644 --- a/src/gallium/auxiliary/SConscript +++ b/src/gallium/auxiliary/SConscript @@ -30,13 +30,13 @@ env.CodeGenerate( source = env.ParseSourceList('Makefile.sources', [ 'C_SOURCES', + 'NIR_SOURCES', 'VL_STUB_SOURCES', 'GENERATED_SOURCES' ]) if env['llvm']: source += env.ParseSourceList('Makefile.sources', [ - 'NIR_SOURCES', 'GALLIVM_SOURCES', ]) |