Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge mozilla-central to autoland.

Browse Source
This commit is contained in:
Cosmin Sabou 2023-04-21 06:06:26 +03:00
commit 382bd8db17
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/moz.configure/toolchain.configure
View File

@ -706,13 +706,18 @@ def rust_search_path(rust_path, search_order, original_path):
return result
# As a workaround until bug 1516228 and bug 1516253 are fixed, set the PATH
# variable for the build to contain the toolchain search path.
#
# FIXME(bug 1802573): The two bugs above are fixed, do we still need that?
#
# Prepend the mozilla-build msys2 path, since otherwise we can get mismatched
# cygwin dll errors during configure if we get called from another msys2
# environment, see bug 1801826.
@depends(mozillabuild_bin_paths)
@depends(mozillabuild_bin_paths, vc_toolchain_search_path)
@imports("os")
def altered_path(mozillabuild_bin_paths):
altered_path = mozillabuild_bin_paths
def altered_path(mozillabuild_bin_paths, vc_toolchain_search_path):
altered_path = mozillabuild_bin_paths + list(vc_toolchain_search_path)
for p in os.environ["PATH"].split(os.pathsep):
if p not in altered_path:
altered_path.append(p)