Pier Angelo Vendrame pushed to branch tor-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits: 8c9bb13d by Pier Angelo Vendrame at 2024-07-16T10:14:30+02:00 Bug 29320: Replace the gnu target with gnullvm for Rust.
- - - - -
2 changed files:
- build/moz.configure/init.configure - build/moz.configure/rust.configure
Changes:
===================================== build/moz.configure/init.configure ===================================== @@ -510,12 +510,16 @@ def split_triplet(triplet, allow_wasi=False): canonical_kernel = "kFreeBSD" elif os.startswith("gnu"): canonical_os = canonical_kernel = "GNU" - elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"): + elif os.startswith("mingw") or os in ( + "windows-msvc", + "windows-gnu", + "windows-gnullvm", + ): canonical_os = canonical_kernel = "WINNT" if not os.startswith("mingw"): if os == "windows-msvc": abi = "msvc" - elif os == "windows-gnu": + elif os == "windows-gnu" or os == "windows-gnullvm": abi = "mingw" # Many things down the line are looking for the string "mingw32" # until they are all fixed, we pretend that's the raw os we had
===================================== build/moz.configure/rust.configure ===================================== @@ -310,9 +310,9 @@ def detect_rustc_target( if host_or_target.abi == "msvc": suffix = "windows-msvc" elif host_or_target.abi == "mingw": - suffix = "windows-gnu" + suffix = "windows-gnullvm" elif compiler_info.type in ("gcc", "clang"): - suffix = "windows-gnu" + suffix = "windows-gnullvm" else: suffix = "windows-msvc" narrowed = [
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8c9bb13d...