Always try to detect cross compiling on *NIX systems

Author: messense

.github/workflows/ci.yml

@@ -193,7 +193,6 @@ jobs:
           cross-expose cffi
           pip install wheel
           pip install -e ../../
-          unset CARGO_BUILD_TARGET
           python setup.py bdist_wheel --py-limited-api=cp36
           ls -la dist/
           ' > build-wheels.sh

setuptools_rust/build.py

@@ -27,6 +27,7 @@
 )
 
 
+
 class _TargetInfo:
     def __init__(self, triple=None, cross_lib=None, linker=None, link_args=None):
         self.triple = triple
@@ -88,9 +89,7 @@ def get_target_info(self):
         # we'll target a 32-bit Rust build.
         # Automatic target detection can be overridden via the CARGO_BUILD_TARGET
         # environment variable or --target command line option
-        if self.target:
-            return _TargetInfo(self.target)
-        elif self.plat_name == "win32":
+        if self.plat_name == "win32":
             return _TargetInfo("i686-pc-windows-msvc")
         elif self.plat_name == "win-amd64":
             return _TargetInfo("x86_64-pc-windows-msvc")
@@ -111,7 +110,7 @@ def get_nix_target_info(self):
 
         if not host_type or host_type == build_type:
             # not *NIX, or not cross compiling
-            return _TargetInfo()
+            return _TargetInfo(self.target)
 
         stdlib = sysconfig.get_path("stdlib")
         cross_lib = os.path.dirname(stdlib)
@@ -128,6 +127,7 @@ def get_nix_target_info(self):
         # hopefully an exact match
         targets = get_rust_target_list()
         if host_type in targets:
+            # FIXME: what if self.target != host_type
             return _TargetInfo(host_type, cross_lib, linker, linker_args)
 
         # the vendor field can be ignored, so x86_64-pc-linux-gnu is compatible
@@ -137,8 +137,12 @@ def get_nix_target_info(self):
             components[1] = "unknown"
             host_type2 = "-".join(components)
             if host_type2 in targets:
+                # FIXME: what if self.target != host_type2
                 return _TargetInfo(host_type2, cross_lib, linker, linker_args)
 
+        if self.target:
+            return _TargetInfo(self.target, cross_lib)
+
         raise DistutilsPlatformError(
             "Don't know the correct rust target for system type %s. Please "
             "set the CARGO_BUILD_TARGET environment variable." % host_type