From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Fri, 2 Nov 2012 09:42:13 +0000 (+0000)
Subject: scons: Update for builtin_stubs.cpp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b;p=mesa.git

scons: Update for builtin_stubs.cpp

Note this by itself is not enough to fix scons build -- it will fail
until you remove:

   rm -rf build/*/glsl/builtin_compiler

because that node was a filei before, but it will be now a directory.

This also means that bisecting across this change will require wiping
the build directory..
---

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 6314c75518b..89014ee3c42 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -71,9 +71,10 @@ else:
     compiler_objs += mesa_objs
 
     builtin_compiler = env.Program(
-        target = 'builtin_compiler',
-        source = compiler_objs + glsl_sources + \
-            source_lists['BUILTIN_COMPILER_CXX_FILES'],
+        target = 'builtin_compiler/builtin_compiler',
+        source = compiler_objs + glsl_sources + [
+            'builtin_compiler/builtin_stubs.cpp',
+        ]
     )
 
     # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll