Correct cross-env script to include prefixes.

Author: freakboy3742

patch/Python/_cross_target.py.tmpl

@@ -12,6 +12,8 @@ import sysconfig
 sys.cross_compiling = True
 sys.platform = "{{platform}}"
 sys.implementation._multiarch = "{{arch}}-{{sdk}}"
+sys.base_prefix = sysconfig.get_config_var("prefix")
+sys.base_exec_prefix = sysconfig.get_config_var("prefix")
 
 ###########################################################################
 # subprocess module patches
@@ -74,5 +76,9 @@ def cross_get_sysconfigdata_name():
 sysconfig.get_platform = cross_get_platform
 sysconfig._get_sysconfigdata_name = cross_get_sysconfigdata_name
 
+# Ensure module-level values cached at time of import are updated.
+sysconfig._BASE_PREFIX = sys.base_prefix
+sysconfig._BASE_EXEC_PREFIX = sys.base_exec_prefix
+
 # Force sysconfig data to be loaded (and cached).
 sysconfig._init_config_vars()

tests/test_cross_env.py

@@ -15,8 +15,10 @@
 # Determine some file system anchor points for the tests
 # Assumes that the tests are run in a virtual environment named
 # `cross-venv`,
-VENV_PREFIX = Path(__file__).parent.parent / "cross-venv"
-default_support_base = f"support/{sys.version_info.major}.{sys.version_info.minor}/{PYTHON_CROSS_PLATFORM}"
+VENV_PREFIX = os.getenv("VIRTUAL_ENV", Path(__file__).parent.parent / "cross-venv")
+default_support_base = (
+    f"support/{sys.version_info.major}.{sys.version_info.minor}/{PYTHON_CROSS_PLATFORM}"
+)
 SUPPORT_PREFIX = (
     Path(__file__).parent.parent
     / os.getenv("PYTHON_SUPPORT_BASE", default_support_base)
@@ -29,6 +31,7 @@
 # sys
 ###########################################################################
 
+
 def test_sys_platform():
     assert sys.platform == PYTHON_CROSS_PLATFORM.lower()
 
@@ -53,6 +56,7 @@ def test_sys_base_exec_prefix():
 # platform
 ###########################################################################
 
+
 def test_platform_system():
     assert platform.system() == PYTHON_CROSS_PLATFORM
 
@@ -61,6 +65,7 @@ def test_platform_system():
 # sysconfig
 ###########################################################################
 
+
 def test_sysconfig_get_platform():
     parts = sysconfig.get_platform().split("-", 2)
     assert parts[0] == PYTHON_CROSS_PLATFORM.lower()
@@ -87,7 +92,7 @@ def test_sysconfig_get_sysconfigdata_name():
         ("platlib", VENV_PREFIX),
         ("scripts", VENV_PREFIX),
         ("data", VENV_PREFIX),
-    ]
+    ],
 )
 def test_sysconfig_get_paths(name, prefix):
     assert sysconfig.get_paths()[name].startswith(str(prefix))