X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesa%2FSConscript;h=c986326d2bfa1ecda1b33fffc0de51f5c52d9b37;hb=89a61afdd7346d6e36caccc4d6f2a2607dc4a1f6;hp=cc5d24221c3fcc8d9322b93f6dd36e2c17939e4c;hpb=d3e9aa8d88e6684235bb0be549551d1402ef8881;p=mesa.git

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index cc5d24221c3..c986326d2bf 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -16,6 +16,7 @@ env.Append(CPPPATH = [
     '#/src',
     '#/src/mapi',
     '#/src/glsl',
+    '#/src/glsl/nir',
     '#/src/mesa',
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
@@ -39,7 +40,7 @@ else:
 # parse Makefile.sources
 source_lists = env.ParseSourceList('Makefile.sources')
 
-env.Append(YACCFLAGS = '-d -p "_mesa_program_"')
+env.Append(YACCFLAGS = ['-d', '-p', '_mesa_program_'])
 env.CFile('program/lex.yy.c', 'program/program_lexer.l')
 env.CFile('program/program_parse.tab.c', 'program/program_parse.y')
 
@@ -131,6 +132,9 @@ def write_git_sha1_h_file(filename):
     except:
         # git log command didn't work
         if not os.path.exists(filename):
+            dirname = os.path.dirname(filename)
+            if not os.path.exists(dirname):
+                os.makedirs(dirname)
             # create an empty file if none already exists
             f = open(filename, "w")
             f.close()