Merge pull request PyO3#187 from davidhewitt/windows-env-detection

windows: don't force msvc toolchain if using gnu
barseghyanartur · Nov 29, 2021 · 63e1ed6 · 63e1ed6
2 parents 357557f + 5f901a3
commit 63e1ed6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Fixed
 - Fix incompatibility with Python 3.6.0 using default values for NamedTuple classes. [#184](https://github.com/PyO3/setuptools-rust/pull/184)
+- Stop forcing the `msvc` Rust toolchain for Windows environments using the `gnu` toolchain. [#187](https://github.com/PyO3/setuptools-rust/pull/187)
 
 ## 1.0.0 (2021-11-21)
 ### Added

diff --git a/setuptools_rust/build.py b/setuptools_rust/build.py
@@ -124,7 +124,7 @@ def build_extension(
             cross_lib = None
             linker = None
 
-        rust_target_info = get_rust_target_info(target_triple)
+        rustc_cfgs = _get_rustc_cfgs(target_triple)
 
         env = _prepare_build_environment(cross_lib)
 
@@ -174,7 +174,7 @@ def build_extension(
 
             # Tell musl targets not to statically link libc. See
             # https://github.com/rust-lang/rust/issues/59302 for details.
-            if b'target_env="musl"' in rust_target_info:
+            if rustc_cfgs.get("target_env") == "musl":
                 rustc_args.extend(["-C", "target-feature=-crt-static"])
 
             command = [
@@ -368,7 +368,7 @@ def _py_limited_api(self) -> PyLimitedApi:
     def _detect_rust_target(
         self, forced_target_triple: Optional[str]
     ) -> Optional["_TargetInfo"]:
-        cross_compile_info = detect_unix_cross_compile_info()
+        cross_compile_info = _detect_unix_cross_compile_info()
         if cross_compile_info is not None:
             cross_target_info = cross_compile_info.to_target_info()
             if forced_target_triple is not None:
@@ -417,8 +417,12 @@ def _detect_local_rust_target(self) -> Optional["_TargetInfo"]:
         # If we are on a 64-bit machine, but running a 32-bit Python, then
         # we'll target a 32-bit Rust build.
         if self.plat_name == "win32":
+            if _get_rustc_cfgs(None).get("target_env") == "gnu":
+                return _TargetInfo.for_triple("i686-pc-windows-gnu")
             return _TargetInfo.for_triple("i686-pc-windows-msvc")
         elif self.plat_name == "win-amd64":
+            if _get_rustc_cfgs(None).get("target_env") == "gnu":
+                return _TargetInfo.for_triple("x86_64-pc-windows-gnu")
             return _TargetInfo.for_triple("x86_64-pc-windows-msvc")
         elif self.plat_name.startswith("macosx-") and platform.machine() == "x86_64":
             # x86_64 or arm64 macOS targeting x86_64
@@ -561,7 +565,7 @@ def to_target_info(self) -> Optional[_TargetInfo]:
         return None
 
 
-def detect_unix_cross_compile_info() -> Optional["_CrossCompileInfo"]:
+def _detect_unix_cross_compile_info() -> Optional["_CrossCompileInfo"]:
     # See https://github.com/PyO3/setuptools-rust/issues/138
     # This is to support cross compiling on *NIX, where plat_name isn't
     # necessarily the same as the system we are running on.  *NIX systems
@@ -588,6 +592,21 @@ def detect_unix_cross_compile_info() -> Optional["_CrossCompileInfo"]:
     return _CrossCompileInfo(host_type, cross_lib, linker, linker_args)
 
 
+_RustcCfgs = Dict[str, Optional[str]]
+
+
+def _get_rustc_cfgs(target_triple: Optional[str]) -> _RustcCfgs:
+    cfgs: _RustcCfgs = {}
+    for entry in get_rust_target_info(target_triple):
+        maybe_split = entry.split("=", maxsplit=1)
+        if len(maybe_split) == 2:
+            cfgs[maybe_split[0]] = maybe_split[1].strip('"')
+        else:
+            assert len(maybe_split) == 1
+            cfgs[maybe_split[0]] = None
+    return cfgs
+
+
 def _replace_vendor_with_unknown(target: str) -> Optional[str]:
     """Replaces vendor in the target triple with unknown.