Bug 1669934 - Unset __PYVENV_LAUNCHER__ before reexecuting python configure in the virtualenv. r=firefox-build-system-reviewers,andi,rstewart

Differential Revision: https://phabricator.services.mozilla.com/D93627
This commit is contained in:
Mike Hommey 2020-10-15 21:30:23 +00:00
Родитель 7f17a09b7d
Коммит 19c21c31d2
1 изменённых файлов: 4 добавлений и 0 удалений

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

@ -357,6 +357,10 @@ def virtualenv_python3(env_python, virtualenv_name, build_env, mozconfig, help):
# value which messes with mach's virtualenv handling code. Override
# Homebrew's changes with the correct sys.executable value.
os.environ['PYTHONEXECUTABLE'] = python
# Another quirk on macOS, with the system python, the virtualenv is
# not fully operational (missing entries in sys.path) if
# __PYVENV_LAUNCHER__ is set.
os.environ.pop('__PYVENV_LAUNCHER__', None)
# One would prefer to use os.execl, but that's completely borked on
# Windows.
sys.exit(subprocess.call([python] + sys.argv))