Mesa (master): scons: Fix dependencies of marshal_generated.[ch].
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sun Mar 26 20:32:00 UTC 2017
Module: Mesa
Branch: master
Commit: 2ba991cbcd809bfdebf42f2df3b94f27439412d4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ba991cbcd809bfdebf42f2df3b94f27439412d4
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Sun Mar 26 21:28:29 2017 +0100
scons: Fix dependencies of marshal_generated.[ch].
These generated source files depend not only upon gl_and_es_API.xml, but
all other XML files that are included by it.
This change updates the generation rules to depend on all gen/*.xml
files, like done for other SCons generation rules, and should fix
incremental broken SCons builds due to missing dependencies.
Trivial.
---
src/mesa/SConscript | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 9398ddb13b..fa4efe101b 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -122,7 +122,7 @@ if env['platform'] not in ('cygwin', 'darwin', 'windows', 'haiku'):
env.CodeGenerate(
target = 'main/marshal_generated.c',
script = GLAPI + 'gen/gl_marshal.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
@@ -130,7 +130,7 @@ env.CodeGenerate(
env.CodeGenerate(
target = 'main/marshal_generated.h',
script = GLAPI + 'gen/gl_marshal_h.py',
- source = GLAPI + 'gen/gl_and_es_API.xml',
+ source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
)
More information about the mesa-commit
mailing list