X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FSConscript;h=3e6baa094c11a9d0396697ed88eed3bf544ad182;hb=d9dd989d2a5d08e465f3c7fcb427aa24ec6247d2;hp=bd20d4e2108b463f450e7636904763eec6c5db90;hpb=b99dcbfeb344390fea9919199b34e5504f7c84e3;p=mesa.git

diff --git a/src/SConscript b/src/SConscript
index bd20d4e2108..3e6baa094c1 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -8,7 +8,6 @@ Import('*')
 if env['platform'] == 'windows':
     SConscript('getopt/SConscript')
 
-SConscript('util/xmlpool/SConscript')
 SConscript('util/SConscript')
 SConscript('compiler/SConscript')
 
@@ -24,22 +23,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 = [ python_cmd, Dir('#').abspath + '/bin/git_sha1_gen.py' ]
-        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
@@ -52,27 +41,10 @@ env.Append(CPPPATH = ["#" + env['build_dir']])
 if env['platform'] != 'windows':
     SConscript('loader/SConscript')
 
-# When env['gles'] is set, the targets defined in mapi/glapi/SConscript are not
-# used.  libgl-xlib and libgl-gdi adapt themselves to use the targets defined
-# in mapi/glapi-shared/SConscript.  mesa/SConscript also adapts itself to
-# enable OpenGL ES support.
 SConscript('mapi/glapi/gen/SConscript')
 SConscript('mapi/glapi/SConscript')
 
-# Haiku C++ libGL dispatch (renderers depend on libgl)
-if env['platform'] in ['haiku']:
-    SConscript('hgl/SConscript')
-
 SConscript('mesa/SConscript')
 
-if not env['embedded']:
-    if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'):
-        SConscript('glx/SConscript')
-    if env['platform'] == 'haiku':
-        SConscript('egl/SConscript')
-
-    if env['gles']:
-        SConscript('mapi/shared-glapi/SConscript')
-
 SConscript('gallium/SConscript')