diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-10-16 17:03:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-16 17:03:13 -0400 |
| commit | 9032207b8a0f5d7328613e16f89e7c128ed5cb8b (patch) | |
| tree | 76f9ab28e2ee78b0cb8c312d1502d8c59b2c6ef4 | |
| parent | b5759e711348dfa1dab86d6e60940e2db720d259 (diff) | |
| parent | e0e1d9de6421b9bce472c35d0ff7af8b8e5445ee (diff) | |
| download | servo-9032207b8a0f5d7328613e16f89e7c128ed5cb8b.tar.gz servo-9032207b8a0f5d7328613e16f89e7c128ed5cb8b.zip | |
Auto merge of #24447 - servo:uninit, r=nox
Work around deprecation warnings caused by autocfg $RUSTFLAGS handling
See https://github.com/servo/servo/issues/24446
| -rw-r--r-- | Cargo.lock | 2 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock index 856ee2170c0..95513e208de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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" diff --git a/Cargo.toml b/Cargo.toml index f054327d267..71b1163d2cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 64d6ca242f7..dd242142adb 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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 |