Bug 1538043 - Remove Visual C++ toolchain search path from $PATH. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D175985
This commit is contained in:
Mike Hommey 2023-04-20 05:19:29 +00:00
Родитель ef45c56746
Коммит d117ab4ffc
1 изменённых файлов: 3 добавлений и 8 удалений

Просмотреть файл

@ -706,18 +706,13 @@ 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, vc_toolchain_search_path)
@depends(mozillabuild_bin_paths)
@imports("os")
def altered_path(mozillabuild_bin_paths, vc_toolchain_search_path):
altered_path = mozillabuild_bin_paths + list(vc_toolchain_search_path)
def altered_path(mozillabuild_bin_paths):
altered_path = mozillabuild_bin_paths
for p in os.environ["PATH"].split(os.pathsep):
if p not in altered_path:
altered_path.append(p)