diff options
Diffstat (limited to 'community/rust/fix-configure-tools.patch')
-rw-r--r-- | community/rust/fix-configure-tools.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/community/rust/fix-configure-tools.patch b/community/rust/fix-configure-tools.patch new file mode 100644 index 0000000000..226ce76a65 --- /dev/null +++ b/community/rust/fix-configure-tools.patch @@ -0,0 +1,35 @@ +From 51b17db7707d745af25558eaa32aaf10080a9a03 Mon Sep 17 00:00:00 2001 +From: Dan Callaghan <djc@djc.id.au> +Date: Sun, 8 Apr 2018 14:59:15 +1000 +Subject: [PATCH] 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. + +Patch-Source: https://github.com/rust-lang/rust/commit/51b17db7707d745af25558eaa32aaf10080a9a03 +--- + src/bootstrap/configure.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py +index a5c373d5d5e7..b06968d313ba 100755 +--- a/src/bootstrap/configure.py ++++ b/src/bootstrap/configure.py +@@ -145,7 +145,7 @@ def v(*args): + 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 @@ def set(key, value): + 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': |