Mesa (master): scons: Update for builtin_stubs.cpp
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Fri Nov 2 09:41:33 UTC 2012
Module: Mesa
Branch: master
Commit: 8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b
Author: José Fonseca <jose.r.fonseca at gmail.com>
Date: Fri Nov 2 09:42:13 2012 +0000
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..
---
src/glsl/SConscript | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 6314c75..89014ee 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
More information about the mesa-commit
mailing list