eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-14 02:47:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move all cargo build environment variables into CommandBase

Browse Source
This commit is contained in:
Matt Brubeck
2016-05-10 15:38:04 -07:00
parent 40be84df26
commit cce565466d
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/servo/command_base.py
View File

@@ -255,7 +255,7 @@ class CommandBase(object):
" --release" if release else ""))
sys.exit()
def build_env(self, gonk=False, hosts_file_path=None):
def build_env(self, gonk=False, hosts_file_path=None, target=None):
"""Return an extended environment dictionary."""
env = os.environ.copy()
if sys.platform == "win32" and type(env['PATH']) == unicode:
@@ -399,6 +399,16 @@ class CommandBase(object):
if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C link-args=-fuse-ld=gold"
if not (self.config["build"]["ccache"] == ""):
env['CCACHE'] = self.config["build"]["ccache"]
# 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['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -W unused-extern-crates"
return env
def servo_crate(self):