From 6ef9d341327412a1e20de2812692172cc4c378c4 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 15 Oct 2019 11:25:36 +0200
Subject: [PATCH 1/2] Work around deprecation warnings caused by autocfg
 $RUSTFLAGS handling

See https://github.com/servo/servo/issues/24446
---
 python/servo/command_base.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 7f4e941a4c7..eb56a4d9c24 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -770,6 +770,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

From e0e1d9de6421b9bce472c35d0ff7af8b8e5445ee Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 15 Oct 2019 15:34:36 +0200
Subject: [PATCH 2/2] Fix #24446

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b18f38cc95f..d70cd576861 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" }