diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-25 22:42:17 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-25 22:42:17 +0530 |
| commit | a211bd1a12254a6a08987bb61f30c8b0e5ce2830 (patch) | |
| tree | 98d12ab7e97f05d7d147fc2392cf25c6a39b5ed4 | |
| parent | 59ba00ed84ca446bd121408245460d7a96ba6d71 (diff) | |
| parent | e83369dd25361d1b55feee42ddad681cb5e5ba87 (diff) | |
| download | servo-a211bd1a12254a6a08987bb61f30c8b0e5ce2830.tar.gz servo-a211bd1a12254a6a08987bb61f30c8b0e5ce2830.zip | |
Auto merge of #10193 - larsbergstrom:use_rustflags, r=Ms2ger
Use rustflags
r? @Ms2ger
<!-- 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/10193)
<!-- Reviewable:end -->
| -rw-r--r-- | cargo-nightly-build | 2 | ||||
| -rwxr-xr-x | etc/rustc-with-gold | 2 | ||||
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cargo-nightly-build b/cargo-nightly-build index 22f4d9c4677..9b70db2b655 100644 --- a/cargo-nightly-build +++ b/cargo-nightly-build @@ -1 +1 @@ -2016-03-04 +2016-03-23 diff --git a/etc/rustc-with-gold b/etc/rustc-with-gold deleted file mode 100755 index 077aa7f0d0b..00000000000 --- a/etc/rustc-with-gold +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -rustc -C link-args=-fuse-ld=gold "$@" diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 381186f2086..581bbaf6821 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -225,6 +225,8 @@ class MachCommands(CommandBase): build_start = time() env = self.build_env() if android: + # Ensure Rust uses hard floats on Android + env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C target-feature=+neon" # Build OpenSSL for android make_cmd = ["make"] if jobs is not None: diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2c980c276aa..35c35cfe6e9 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -385,7 +385,7 @@ class CommandBase(object): # Don't run the gold linker if on Windows https://github.com/servo/servo/issues/9499 if self.config["tools"]["rustc-with-gold"] and sys.platform not in ("win32", "msys"): if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0: - env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold') + env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C link-args=-fuse-ld=gold" return env |