summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-06-29 17:21:44 +0100
committerEric Engestrom <[email protected]>2017-06-29 17:38:26 +0100
commit9f6110ad327275fecc68248c1d6bd85f6b3d111c (patch)
tree470aa8004df8f0ea68650e7b9652f6bf6f96191b
parent3fd425aed764fb771f2f49ddb6b30b389a114504 (diff)
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 <[email protected]> Signed-off-by: Eric Engestrom <[email protected]>
-rw-r--r--src/SConscript2
1 files changed, 1 insertions, 1 deletions
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