From e266953f391b129e7c6c5c905c9dd3aeefc5de9d Mon Sep 17 00:00:00 2001 From: Per Lundberg Date: Wed, 25 May 2016 00:52:18 +0300 Subject: [PATCH] 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. I noted the `BIN_SUFFIX` existed elsewhere so it felt logical to use it here also. --- python/servo/build_commands.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 369918595ce..32989c86ad8 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -23,7 +23,7 @@ from mach.decorators import ( Command, ) -from servo.command_base import CommandBase, cd, call +from servo.command_base import CommandBase, cd, call, BIN_SUFFIX def notify_linux(title, text): @@ -226,8 +226,10 @@ class MachCommands(CommandBase): env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") env['OPENSSL_STATIC'] = 'TRUE' + cargo_binary = "cargo" + BIN_SUFFIX + status = call( - ["cargo", "build"] + opts, + [cargo_binary, "build"] + opts, env=env, cwd=self.servo_crate(), verbose=verbose) elapsed = time() - build_start