servo: Merge #10193 - Use rustflags (from larsbergstrom:use_rustflags); r=Ms2ger

r? @Ms2ger

Source-Repo: https://github.com/servo/servo
Source-Revision: a211bd1a12254a6a08987bb61f30c8b0e5ce2830

servo/cargo-nightly-build

@@ -1 +1 @@
-2016-03-04
+2016-03-23

servo/etc/rustc-with-gold

@@ -1,2 +0,0 @@
-#!/bin/sh
-rustc -C link-args=-fuse-ld=gold "$@"

servo/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:

servo/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