scons: fix write_git_sha1_h_file() issue on Windows

Unlike on Unix, os.rename(src, dst) will fail on Windows if the dst file
already exists.  Remove it first.

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 595f8fc8f288e252fefa07aa3d31c9f3eb9ff656..3d5d37ae099e35625484870ff87cb37ab286b72c 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -488,6 +488,8 @@ def write_git_sha1_h_file(filename):
     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 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
 
         os.rename(tempfile, filename)
     return