Skip to content

Commit 12f1ae6

Browse files
committed
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.
2 parents b7da1aa + 51b17db commit 12f1ae6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/bootstrap/configure.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def v(*args):
145145
o("full-bootstrap", "build.full-bootstrap", "build three compilers instead of two")
146146
o("extended", "build.extended", "build an extended rust tool set")
147147

148-
v("tools", "build.tools", "List of extended tools will be installed")
148+
v("tools", None, "List of extended tools will be installed")
149149
v("build", "build.build", "GNUs ./configure syntax LLVM build triple")
150150
v("host", None, "GNUs ./configure syntax LLVM host triples")
151151
v("target", None, "GNUs ./configure syntax LLVM target triples")
@@ -321,6 +321,8 @@ def set(key, value):
321321
set('target.{}.llvm-config'.format(build()), value + '/bin/llvm-config')
322322
elif option.name == 'jemalloc-root':
323323
set('target.{}.jemalloc'.format(build()), value + '/libjemalloc_pic.a')
324+
elif option.name == 'tools':
325+
set('build.tools', value.split(','))
324326
elif option.name == 'host':
325327
set('build.host', value.split(','))
326328
elif option.name == 'target':

0 commit comments

Comments
 (0)