Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mullvad Browser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Applications
Mullvad Browser
Commits
c7612bb0
Verified
Commit
c7612bb0
authored
Jun 13, 2024
by
Pier Angelo Vendrame
Browse files
Options
Downloads
Patches
Plain Diff
Bug 29320: Replace the gnu target with gnullvm for Rust.
parent
398130e0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
build/moz.configure/init.configure
+6
-2
6 additions, 2 deletions
build/moz.configure/init.configure
build/moz.configure/rust.configure
+2
-2
2 additions, 2 deletions
build/moz.configure/rust.configure
with
8 additions
and
4 deletions
build/moz.configure/init.configure
+
6
−
2
View file @
c7612bb0
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
build/moz.configure/rust.configure
+
2
−
2
View file @
c7612bb0
...
...
@@ -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-gnu
llvm
"
elif
compiler_info
.
type
in
(
"
gcc
"
,
"
clang
"
):
suffix
=
"
windows-gnu
"
suffix
=
"
windows-gnu
llvm
"
else
:
suffix
=
"
windows-msvc
"
narrowed
=
[
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment