Mesa (master): scons: gallium/auxiliary: Unconditionally compile NIR regardless of LLVM

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f21dd3bc5a06e700988926522f81727efde7123c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f21dd3bc5a06e700988926522f81727efde7123c

Author: Marijn Suijten <marijns95 at gmail.com>
Date:   Wed Oct 21 00:26:46 2020 +0200

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 at freedesktop.org>
Acked-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7250>

---

 src/gallium/auxiliary/SConscript | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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',
     ])