From 26a78817c1e5d720ed4923be984d962df2f6774f Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Thu, 7 Jul 2016 17:10:30 +0200
Subject: [PATCH] Make "./mach geckolib" use the stable Rust compiler

---
 .gitignore                     | 1 +
 python/servo/build_commands.py | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e96d93837e1..64e25e1b201 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /ports/android/libs
 /ports/android/local.properties
 /ports/android/obj
+/ports/geckolib/target
 /python/_virtualenv
 /python/tidy/servo_tidy.egg-info
 *~
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 7a4dba41cfa..20c9bf28c6b 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -356,6 +356,7 @@ class MachCommands(CommandBase):
                      action='store_true',
                      help='Build in release mode')
     def build_geckolib(self, jobs=None, verbose=False, release=False):
+        self.set_use_stable_rust()
         self.ensure_bootstrapped()
 
         ret = None
@@ -367,11 +368,12 @@ class MachCommands(CommandBase):
         if release:
             opts += ["--release"]
 
-        build_start = time()
         env = self.build_env()
+        env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "ports/geckolib/target")
+
+        build_start = time()
         with cd(path.join("ports", "geckolib")):
-            ret = call(["cargo", "build"] + opts,
-                       env=env, verbose=verbose)
+            ret = call(["cargo", "build"] + opts, env=env, verbose=verbose)
         elapsed = time() - build_start
 
         # Generate Desktop Notification if elapsed-time > some threshold value