From: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Thu, 29 Jun 2017 16:21:44 +0000 (+0100)
Subject: scons: wait on subprocess' completion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f6110ad327275fecc68248c1d6bd85f6b3d111c;p=mesa.git

scons: wait on subprocess' completion

Windows doesn't allow you to move a file that's opened, and Popen()
doesn't wait on its subprocess' completion before returning, which leads
to broken Windows build.

Fixes: 3fd425aed764fb771f2f "build systems: uniformize git_sha1.h generation"
Suggested-by: Scott D Phillips <scott.d.phillips@intel.com>
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/SConscript b/src/SConscript
index 5e1171b5246..c31e4ec06fa 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -26,7 +26,7 @@ def write_git_sha1_h_file(filename):
     with open(tempfile, "w") as f:
         args = [ 'sh', Dir('#').abspath + '/git_sha1_gen.sh' ]
         try:
-            subprocess.Popen(args, stdout=f)
+            subprocess.Popen(args, stdout=f).wait()
         except:
             print "Warning: exception in write_git_sha1_h_file()"
             return