Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-12 18:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #11393 - perlun:fix/find-cargo-exe-on-windows, r=metajack

Browse source 
Fixed the build tools to handle cargo being named cargo.exe

It's actually quite weird that I had to do this, but I got errors without it (on Windows). I noted the `BIN_SUFFIX` existed elsewhere so it felt logical to use it here also.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11393)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-25 12:41:30 -05:00
commit 40b2d424c0
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/servo/build_commands.py
View file

@ -23,7 +23,7 @@ from mach.decorators import (
Command, Command,
) )
from servo.command_base import CommandBase, cd, call from servo.command_base import CommandBase, cd, call, BIN_SUFFIX
def notify_linux(title, text): def notify_linux(title, text):
@ -226,8 +226,10 @@ class MachCommands(CommandBase):
env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")
env['OPENSSL_STATIC'] = 'TRUE' env['OPENSSL_STATIC'] = 'TRUE'
cargo_binary = "cargo" + BIN_SUFFIX
status = call( status = call(
["cargo", "build"] + opts, [cargo_binary, "build"] + opts,
env=env, cwd=self.servo_crate(), verbose=verbose) env=env, cwd=self.servo_crate(), verbose=verbose)
elapsed = time() - build_start elapsed = time() - build_start