From 55ee88f8c7ac329ae54296e404e9b0d5b1742e4c Mon Sep 17 00:00:00 2001 From: nobled Date: Tue, 6 Jul 2010 18:11:59 +0000 Subject: [PATCH] slang: wrap abspath to executable in quotes Fixes: "slang build fails if absolute path contains spaces" http://bugs.freedesktop.org/28894 Regression from 3371f7e5025e5288eaba78973a2c81ec5d5b1e4d --- src/mesa/slang/library/SConscript | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/slang/library/SConscript b/src/mesa/slang/library/SConscript index 5112cef..3fc8146 100644 --- a/src/mesa/slang/library/SConscript +++ b/src/mesa/slang/library/SConscript @@ -12,19 +12,19 @@ def glsl_compile_emitter(target, source, env): return (target, source) bld_frag = Builder( - action = Action(glsl_compile[0].abspath + ' fragment $SOURCE $TARGET', '$CODEGENCODESTR'), + action = Action('"' + glsl_compile[0].abspath + '"' + ' fragment $SOURCE $TARGET', '$CODEGENCODESTR'), emitter = glsl_compile_emitter, suffix = '.gc', src_suffix = '_gc.h') bld_vert = Builder( - action = Action(glsl_compile[0].abspath + ' vertex $SOURCE $TARGET', '$CODEGENCODESTR'), + action = Action('"' + glsl_compile[0].abspath + '"' + ' vertex $SOURCE $TARGET', '$CODEGENCODESTR'), emitter = glsl_compile_emitter, suffix = '.gc', src_suffix = '_gc.h') bld_geom = Builder( - action = Action(glsl_compile[0].abspath + ' geometry $SOURCE $TARGET', '$CODEGENCODESTR'), + action = Action('"' + glsl_compile[0].abspath + '"' + ' geometry $SOURCE $TARGET', '$CODEGENCODESTR'), emitter = glsl_compile_emitter, suffix = '.gc', src_suffix = '_gc.h') -- 1.5.4.3