diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2016-05-10 15:38:04 -0700 |
|---|---|---|
| committer | Matt Brubeck <mbrubeck@limpet.net> | 2016-05-10 20:16:55 -0700 |
| commit | cce565466d514271a523b0872facd1d90fbfba92 (patch) | |
| tree | b519b7c0e0fb2fd5fafa43a8f370558080b077cf /python/servo/build_commands.py | |
| parent | 40be84df26ce3ce80851e751374154c015506921 (diff) | |
| download | servo-cce565466d514271a523b0872facd1d90fbfba92.tar.gz servo-cce565466d514271a523b0872facd1d90fbfba92.zip | |
Move all cargo build environment variables into CommandBase
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 40db368bfe8..feca17976d0 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -204,12 +204,7 @@ class MachCommands(CommandBase): opts += ["--features", "%s" % ' '.join(features)] build_start = time() - env = self.build_env() - - # Ensure Rust uses hard floats and SIMD on ARM devices - if target: - if target.startswith('arm') or target.startswith('aarch64'): - env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C target-feature=+neon" + env = self.build_env(target=target) if android: # Build OpenSSL for android @@ -225,7 +220,7 @@ class MachCommands(CommandBase): with cd(openssl_dir): status = call( make_cmd + ["-f", "openssl.makefile"], - env=self.build_env(), + env=env, verbose=verbose) if status: return status @@ -234,11 +229,6 @@ class MachCommands(CommandBase): env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") env['OPENSSL_STATIC'] = 'TRUE' - if not (self.config["build"]["ccache"] == ""): - env['CCACHE'] = self.config["build"]["ccache"] - - env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -W unused-extern-crates" - status = call( ["cargo", "build"] + opts, env=env, cwd=self.servo_crate(), verbose=verbose) |