about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-08 21:40:44 +0000
committerbors <bors@rust-lang.org>2018-04-08 21:40:44 +0000
commit12f1ae60a90d0a39eef7073814464b4d7df949f2 (patch)
tree532a1033abfa201a9d9ae5f93a49dcbb0607040e /src
parentb7da1aaff62c1394d56830dc975d24d99c7a4fd8 (diff)
parent51b17db7707d745af25558eaa32aaf10080a9a03 (diff)
downloadrust-12f1ae60a90d0a39eef7073814464b4d7df949f2.tar.gz
rust-12f1ae60a90d0a39eef7073814464b4d7df949f2.zip
Auto merge of #49774 - danc86:configure.py-tools, r=alexcrichton
configure.py --tools should set a list instead of a string

Currently the --tools option does not work because it is setting a string value
for 'build.tools'. It should be a list of strings instead.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/bootstrap/configure.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index a5c373d5d5e..b06968d313b 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -145,7 +145,7 @@ o("jemalloc", "rust.use-jemalloc", "build liballoc with jemalloc")
 o("full-bootstrap", "build.full-bootstrap", "build three compilers instead of two")
 o("extended", "build.extended", "build an extended rust tool set")
 
-v("tools", "build.tools", "List of extended tools will be installed")
+v("tools", None, "List of extended tools will be installed")
 v("build", "build.build", "GNUs ./configure syntax LLVM build triple")
 v("host", None, "GNUs ./configure syntax LLVM host triples")
 v("target", None, "GNUs ./configure syntax LLVM target triples")
@@ -321,6 +321,8 @@ for key in known_args:
         set('target.{}.llvm-config'.format(build()), value + '/bin/llvm-config')
     elif option.name == 'jemalloc-root':
         set('target.{}.jemalloc'.format(build()), value + '/libjemalloc_pic.a')
+    elif option.name == 'tools':
+        set('build.tools', value.split(','))
     elif option.name == 'host':
         set('build.host', value.split(','))
     elif option.name == 'target':