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] 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