Auto merge of #12319 - servo:stable-geckolib, r=larsbergstrom+SimonSapin

Use a stable compiler for build-geckolib

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #11815 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because CI already runs `./mach build-geckolib`

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12319)
<!-- Reviewable:end -->

1 files changed, 5 insertions, 40 deletions

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index 7a4dba41cfa..0e7151e5efc 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -265,43 +265,6 @@ class MachCommands(CommandBase):
         print("Build completed in %s" % format_duration(elapsed))
         return status
 
-    @Command('build-stable',
-             description='Build Servo using stable rustc',
-             category='build')
-    @CommandArgument('--target', '-t',
-                     default=None,
-                     help='Cross compile for given target platform')
-    @CommandArgument('--release', '-r',
-                     action='store_true',
-                     help='Build in release mode')
-    @CommandArgument('--dev', '-d',
-                     action='store_true',
-                     help='Build in development mode')
-    @CommandArgument('--jobs', '-j',
-                     default=None,
-                     help='Number of jobs to run in parallel')
-    @CommandArgument('--features',
-                     default=None,
-                     help='Space-separated list of features to also build',
-                     nargs='+')
-    @CommandArgument('--android',
-                     default=None,
-                     action='store_true',
-                     help='Build for Android')
-    @CommandArgument('--debug-mozjs',
-                     default=None,
-                     action='store_true',
-                     help='Enable debug assertions in mozjs')
-    @CommandArgument('--verbose', '-v',
-                     action='store_true',
-                     help='Print verbose output')
-    @CommandArgument('params', nargs='...',
-                     help="Command-line arguments to be passed through to Cargo")
-    def build_stable(self, target=None, release=False, dev=False, jobs=None,
-                     features=None, android=None, verbose=False, debug_mozjs=False, params=None):
-        self.set_use_stable_rust()
-        self.build(target, release, dev, jobs, features, android, verbose, debug_mozjs, params)
-
     @Command('build-cef',
              description='Build the Chromium Embedding Framework library',
              category='build')
@@ -356,6 +319,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 +331,12 @@ class MachCommands(CommandBase):
         if release:
             opts += ["--release"]
 
-        build_start = time()
         env = self.build_env()
+        env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib")
+
+        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