X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=95ea061c4bba124c855a50b931b8e8974123e93c;hb=bd98b8c74ef9d404f98b77519eaf327b938a150a;hp=37b3f8572e25a28dee7fbb6c64eef9131998327b;hpb=076faf8764d3cd8038145286f7533d0a18e82476;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index 37b3f8572e2..95ea061c4bb 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,12 +1,14 @@
 import filecmp
 import os
 import subprocess
+from sys import executable as python_cmd
 
 Import('*')
 
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
 
+SConscript('util/xmlpool/SConscript')
 SConscript('util/SConscript')
 SConscript('compiler/SConscript')
 
@@ -22,22 +24,12 @@ def write_git_sha1_h_file(filename):
     to retrieve the git hashid and write the header file.  An empty file
     will be created if anything goes wrong."""
 
-    tempfile = "git_sha1.h.tmp"
-    with open(tempfile, "w") as f:
-        args = [ 'sh', Dir('#').abspath + '/bin/git_sha1_gen.sh' ]
-        try:
-            subprocess.Popen(args, stdout=f).wait()
-        except:
-            print "Warning: exception in write_git_sha1_h_file()"
-            return
-
-    if not os.path.exists(filename) or not filecmp.cmp(tempfile, filename):
-        # The filename does not exist or it's different from the new file,
-        # so replace old file with new.
-        if os.path.exists(filename):
-            os.remove(filename)
-        os.rename(tempfile, filename)
-    return
+    args = [ python_cmd, Dir('#').abspath + '/bin/git_sha1_gen.py', '--output', filename ]
+    try:
+        subprocess.call(args)
+    except:
+        print("Warning: exception in write_git_sha1_h_file()")
+        return
 
 
 # Create the git_sha1.h header file