summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2012-11-02 09:42:13 +0000
committerJosé Fonseca <[email protected]>2012-11-02 09:43:42 +0000
commit8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b (patch)
tree0aa2f7ad795276576aa88660a5babd1a7cf5bfee
parent9948a33653088c2b9409f12924857643989657a5 (diff)
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..
-rw-r--r--src/glsl/SConscript7
1 files changed, 4 insertions, 3 deletions
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