about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-25 08:04:15 +0000
committerbors <bors@rust-lang.org>2017-07-25 08:04:15 +0000
commit5c126bdee6af3feef2d51956debab72f933078c6 (patch)
tree59788e37fe2435449d0cb582987ed5df0308988d /src/bootstrap
parent917260ebc28acbe162bc2d91c0b3c28b9b2ebfc3 (diff)
parentc41ac2e11a84f7591c4ddd435c3567aae743ad0e (diff)
downloadrust-5c126bdee6af3feef2d51956debab72f933078c6.tar.gz
rust-5c126bdee6af3feef2d51956debab72f933078c6.zip
Auto merge of #43384 - segevfiner:bootstrap-build-argument-fix, r=aidanhs
rustbuild: Fix the --build argument to bootstrap.py

This makes the --build argument also apply for the downloading of the stage0 toolchain and building rustbuild.

Fixes #42116
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/bootstrap.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index ebc4c2fdf7b..a8b1032ae5e 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -596,6 +596,7 @@ class RustBuild(object):
 def bootstrap():
     parser = argparse.ArgumentParser(description='Build rust')
     parser.add_argument('--config')
+    parser.add_argument('--build')
     parser.add_argument('--clean', action='store_true')
     parser.add_argument('-v', '--verbose', action='store_true')
 
@@ -669,7 +670,7 @@ def bootstrap():
     rb.update_submodules()
 
     # Fetch/build the bootstrap
-    rb.build = rb.build_triple()
+    rb.build = args.build or rb.build_triple()
     rb.download_stage0()
     sys.stdout.flush()
     rb.build_bootstrap()