Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-29 03:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #26198 - Manishearth:vcvarsall-fail, r=jdm

Browse source 
Report error when vcvarsall fails

In trying to get my Windows cross build working on my desktop, I ended up spending a lot of time trying to replicate a failure within servo's build system that ultimately turned out to be vcvarsall silently failing (I was missing a trailing slash in my `VSINSTALLDIR` env var, which vcvarsall does not handle well at all)

We should report an error when this happens.

r? @jdm
This commit is contained in:
bors-servo 2020-04-16 15:05:42 -04:00 • committed by GitHub
commit 7d3617a0d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/build_commands.py
View file

@ -315,11 +315,15 @@ class MachCommands(CommandBase):
process = subprocess.Popen('("%s" %s > nul) && "python" -c "import os; print(repr(os.environ))"' % process = subprocess.Popen('("%s" %s > nul) && "python" -c "import os; print(repr(os.environ))"' %
(os.path.join(vs_dirs['vcdir'], "Auxiliary", "Build", "vcvarsall.bat"), "x64"), (os.path.join(vs_dirs['vcdir'], "Auxiliary", "Build", "vcvarsall.bat"), "x64"),
stdout=subprocess.PIPE, shell=True) stdout=subprocess.PIPE, shell=True)
stdout, _ = process.communicate() stdout, stderr = process.communicate()
exitcode = process.wait() exitcode = process.wait()
encoding = locale.getpreferredencoding() # See https://stackoverflow.com/a/9228117 encoding = locale.getpreferredencoding() # See https://stackoverflow.com/a/9228117
if exitcode == 0: if exitcode == 0:
os.environ.update(eval(stdout.decode(encoding))) os.environ.update(eval(stdout.decode(encoding)))
else:
print("Failed to run vcvarsall. stderr:")
print(stderr.decode(encoding))
exit(1)
# Ensure that GStreamer libraries are accessible when linking. # Ensure that GStreamer libraries are accessible when linking.
if 'windows' in target_triple: if 'windows' in target_triple: