Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24447 - servo:uninit, r=nox

Browse source 
Work around deprecation warnings caused by autocfg $RUSTFLAGS handling

See https://github.com/servo/servo/issues/24446
This commit is contained in:
bors-servo 2019-10-16 17:03:13 -04:00 • committed by GitHub
commit 9032207b8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -151,7 +151,7 @@ dependencies = [
[[package]]
name = "autocfg"
version = "0.1.6"
source = "git+https://github.com/servo/autocfg?branch=rustflags#d040e25ff6c129189306011f6a0ff210e08227a0"
source = "git+https://github.com/servo/autocfg?branch=rustflags2#9142612f4b2599e6a858dc32cd3cbda5c98bd651"
[[package]]
name = "azure"

2
Cargo.toml
View file

@ -30,6 +30,6 @@ mio = { git = "https://github.com/servo/mio.git", branch = "servo" }
rand_os = { git = "https://github.com/servo/rand", branch = "servo-rand_os-0.1.3-uwp" }
rand_core = { git = "https://github.com/servo/rand", branch = "servo-rand_os-0.1.3-uwp" }
# https://github.com/cuviper/autocfg/pull/10
autocfg = { git = "https://github.com/servo/autocfg", branch = "rustflags" }
autocfg = { git = "https://github.com/servo/autocfg", branch = "rustflags2" }
# https://github.com/retep998/winapi-rs/pull/816
winapi = { git = "https://github.com/servo/winapi-rs", branch = "patch-1" }

4
python/servo/command_base.py
View file

@ -772,6 +772,10 @@ install them, let us know by filing a bug!")
if self.config["build"]["thinlto"]:
env['RUSTFLAGS'] += " -Z thinlto"
# Work around https://github.com/servo/servo/issues/24446
# Argument-less str.split normalizes leading, trailing, and double spaces
env['RUSTFLAGS'] = " ".join(env['RUSTFLAGS'].split())
return env
@staticmethod