Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1720215: Remove MACOSX_DEPLOYMENT_TARGET virtualenv workaround r=firefox-build-system-reviewers,andi

Browse Source 
Now that the upstream Python bug has been resolved since Python 3.4 (at
the latest), we can safely remove the environment variable workaround.

Differential Revision: https://phabricator.services.mozilla.com/D119687
This commit is contained in:
Mitchell Hentges 2021-08-05 15:14:18 +00:00
parent 656826ef2f
commit 78fecb6128
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
python/mozbuild/mozbuild/virtualenv.py
View File

@ -315,35 +315,13 @@ class VirtualenvManager(VirtualenvHelper):
"""
import distutils.sysconfig
# We always target the OS X deployment target that Python itself was
# built with, regardless of what's in the current environment. If we
# don't do this, we may run into a Python bug. See
# http://bugs.python.org/issue9516 and bug 659881.
#
# Note that this assumes that nothing compiled in the virtualenv is
# shipped as part of a distribution. If we do ship anything, the
# deployment target here may be different from what's targeted by the
# shipping binaries and # virtualenv-produced binaries may fail to
# work.
#
# We also ignore environment variables that may have been altered by
# We ignore environment variables that may have been altered by
# configure or a mozconfig activated in the current shell. We trust
# Python is smart enough to find a proper compiler and to use the
# proper compiler flags. If it isn't your Python is likely broken.
IGNORE_ENV_VARIABLES = ("CC", "CXX", "CFLAGS", "CXXFLAGS", "LDFLAGS")
try:
old_target = os.environ.get("MACOSX_DEPLOYMENT_TARGET", None)
sysconfig_target = distutils.sysconfig.get_config_var(
"MACOSX_DEPLOYMENT_TARGET"
)
if sysconfig_target is not None:
# MACOSX_DEPLOYMENT_TARGET is usually a string (e.g.: "10.14.6"), but
# in some cases it is an int (e.g.: 11). Since environment variables
# must all be str, explicitly convert it.
os.environ["MACOSX_DEPLOYMENT_TARGET"] = str(sysconfig_target)
old_env_variables = {}
for k in IGNORE_ENV_VARIABLES:
if k not in os.environ:
@ -368,11 +346,6 @@ class VirtualenvManager(VirtualenvHelper):
self.install_pip_package(pypi_requirement.full_specifier)
finally:
os.environ.pop("MACOSX_DEPLOYMENT_TARGET", None)
if old_target is not None:
os.environ["MACOSX_DEPLOYMENT_TARGET"] = old_target
os.environ.update(old_env_variables)
def call_setup(self, directory, arguments):