about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-08-24 23:07:41 +0000
committerbors <bors@rust-lang.org>2020-08-24 23:07:41 +0000
commit3cf8f69fec295741fb2dda6593925ad5d3dd8f39 (patch)
tree369071ae12cf38396929229fa26204010f947b51 /src/bootstrap
parentf44c6e4e288e4f49c5c257b2e2cb2ad5918f26a3 (diff)
parentfbce8785d4ca784006ff84d8226befe8b372decd (diff)
Auto merge of #75625 - mati865:mingw-cross-compile, r=Mark-Simulacrum
Fix windows-gnu host cross-compilation

Fixes https://github.com/rust-lang/rust/issues/64218

Also turns out it's faster to run Linux virtual machine on Windows and cross-compile `./x.py dist` than doing it on Windows directly...
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/dist.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 01121977f13..f0b2254be9e 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -226,7 +226,7 @@ fn make_win_dist(
         let idx = line.find(':').unwrap();
         let key = &line[..idx];
         let trim_chars: &[_] = &[' ', '='];
-        let value = line[(idx + 1)..].trim_start_matches(trim_chars).split(';').map(PathBuf::from);
+        let value = env::split_paths(line[(idx + 1)..].trim_start_matches(trim_chars));
 
         if key == "programs" {
             bin_path.extend(value);