summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2022-11-09 17:56:54 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2022-11-10 01:40:14 +0530
commit96ab6aac297dbf4838d61e4a12ac103ec53b5ace (patch)
tree91dcf9f462818a8b861efcb9f85bdcd68c324f83
parent75ea43049acb9895d2c8dea4321f89ab44548243 (diff)
cerbero: Bootstrap MSVC Rust toolchain for build-tools
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1006>
-rw-r--r--cerbero/bootstrap/rust.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/cerbero/bootstrap/rust.py b/cerbero/bootstrap/rust.py
index 75f2e84d..2a31383b 100644
--- a/cerbero/bootstrap/rust.py
+++ b/cerbero/bootstrap/rust.py
@@ -79,9 +79,9 @@ class RustBootstrapper(BootstrapperBase):
self.build_triple = self.config.rust_build_triple
self.target_triples = self.config.rust_target_triples
if self.config.platform == Platform.WINDOWS:
- # On Windows, build-tools always use the GNU toolchain for
- # historical reasons so we need to also bootstrap $arch-windows-gnu
- bs_triple = self.config.rust_triple(self.config.arch, self.config.platform, False)
+ # On Windows, build-tools always use MSVC so we need to always
+ # bootstrap $arch-windows-msvc
+ bs_triple = self.config.rust_triple(self.config.arch, self.config.platform, True)
if bs_triple not in self.target_triples:
self.target_triples.append(bs_triple)
self.fetch_urls = self.get_fetch_urls()