From 263fa24d88abeae72a2775c83227cb63ccd28c04 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 13 Dec 2017 12:06:02 -0600
Subject: [PATCH] Add rustup-installed binaries to $PATH

This is a continuation of https://github.com/servo/saltfs/pull/758
---
 buildbot/master/files/config/environments.py | 30 ++++++++------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py
index b1e787e8..ab007216 100644
--- a/buildbot/master/files/config/environments.py
+++ b/buildbot/master/files/config/environments.py
@@ -66,6 +66,7 @@ def without(self, to_unset):
         r'C:\Program Files\Git\cmd',
         r'C:\Program Files (x86)\WiX Toolset v3.10\bin',
         r'C:\sccache',
+        r'C:\Users\Administrator\.cargo\bin',
     ]),
     'SERVO_CACHE_DIR': r'C:\Users\Administrator\.servo',
 })
@@ -85,6 +86,16 @@ def without(self, to_unset):
     'DISPLAY': ':0',
     'SERVO_CACHE_DIR': '{{ common.servo_home }}/.servo',
     'SHELL': '/bin/bash',
+    'PATH': ':'.join([
+        '{{ common.servo_home }}/.cargo/bin',
+        '{{ common.servo_home }}/bin',
+        '/usr/local/sbin',
+        '/usr/local/bin',
+        '/usr/bin',
+        '/usr/sbin',
+        '/sbin',
+        '/bin',
+    ]),
 })
 
 build_android = build_linux + Environment({
@@ -93,6 +104,7 @@ def without(self, to_unset):
     # TODO(aneeshusa): Template this value for e.g. macOS builds
     'JAVA_HOME': '/usr/lib/jvm/java-8-openjdk-amd64',
     'PATH': ':'.join([
+        '{{ common.servo_home }}/.cargo/bin',
         '/usr/local/sbin',
         '/usr/local/bin',
         '/usr/bin',
@@ -116,15 +128,6 @@ def without(self, to_unset):
     'BUILD_TARGET': 'arm-unknown-linux-gnueabihf',
     'CC_arm-unknown-linux-gnueabihf': 'arm-linux-gnueabihf-gcc',
     'CXX_arm-unknown-linux-gnueabihf': 'arm-linux-gnueabihf-g++',
-    'PATH': ':'.join([
-        '{{ common.servo_home }}/bin',
-        '/usr/local/sbin',
-        '/usr/local/bin',
-        '/usr/bin',
-        '/usr/sbin',
-        '/sbin',
-        '/bin',
-    ]),
     'PKG_CONFIG_PATH': '/usr/lib/arm-linux-gnueabihf/pkgconfig',
 })
 
@@ -132,15 +135,6 @@ def without(self, to_unset):
     'BUILD_TARGET': 'aarch64-unknown-linux-gnu',
     'CC_aarch64-unknown-linux-gnu': 'aarch64-linux-gnu-gcc',
     'CXX_aarch64-unknown-linux-gnu': 'aarch64-linux-gnu-g++',
-    'PATH': ':'.join([
-        '{{ common.servo_home }}/bin',
-        '/usr/local/sbin',
-        '/usr/local/bin',
-        '/usr/bin',
-        '/usr/sbin',
-        '/sbin',
-        '/bin',
-    ]),
     'PKG_CONFIG_PATH': '/usr/lib/aarch64-linux-gnu/pkgconfig',
     'SERVO_RUSTC_WITH_GOLD': 'False',
 })