Merge tag 'v74.1.3'

jaraco · jaraco · commit ffdf0bd160eb · 2024-09-15T10:44:24.000-04:00
Bump version: 74.1.2 → 74.1.3
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 74.1.2
+current_version = 74.1.3
 commit = True
 tag = True
 
diff --git a/NEWS.rst b/NEWS.rst
@@ -1,3 +1,12 @@
+v74.1.3
+=======
+
+Bugfixes
+--------
+
+- Fix cross-platform compilation using ``distutils._msvccompiler.MSVCCompiler`` -- by :user:`saschanaz` and :user:`Avasam` (#4648)
+
+
 v74.1.2
 =======
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "setuptools"
-version = "74.1.2"
+version = "74.1.3"
 authors = [
 	{ name = "Python Packaging Authority", email = "distutils-sig@python.org" },
 ]
diff --git a/setuptools/_distutils/_msvccompiler.py b/setuptools/_distutils/_msvccompiler.py
@@ -284,7 +284,7 @@ def initialize(self, plat_name=None):
                 f"--plat-name must be one of {tuple(_vcvars_names)}"
             )
 
-        plat_spec = _get_vcvars_spec(get_host_platform(), get_platform())
+        plat_spec = _get_vcvars_spec(get_host_platform(), plat_name)
 
         vc_env = _get_vc_env(plat_spec)
         if not vc_env:

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ backend-path = ["."]`
`5`	`5`
`6`	`6`	`[project]`
`7`	`7`	`name = "setuptools"`
`8`		`-version = "74.1.2"`
	`8`	`+version = "74.1.3"`
`9`	`9`	`authors = [`
`10`	`10`	`{ name = "Python Packaging Authority", email = "[email protected]" },`
`11`	`11`	`]`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ def initialize(self, plat_name=None):`
`284`	`284`	`f"--plat-name must be one of {tuple(_vcvars_names)}"`
`285`	`285`	`)`
`286`	`286`
`287`		`- plat_spec = _get_vcvars_spec(get_host_platform(), get_platform())`
	`287`	`+ plat_spec = _get_vcvars_spec(get_host_platform(), plat_name)`
`288`	`288`
`289`	`289`	`vc_env = _get_vc_env(plat_spec)`
`290`	`290`	`if not vc_env:`