Merge branch 'main' into py-limited-api

Author: davidhewitt

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 ## Unreleased
 ### Added
+- Add `--target` command line option for specifying target triple. [#136](https://github.com/PyO3/setuptools-rust/pull/136)
 - Add new default `"auto"` setting for `RustExtension.py_limited_api`. [#137](https://github.com/PyO3/setuptools-rust/pull/137)
+- Support very verbose cargo build.rs output. [#140](https://github.com/PyO3/setuptools-rust/pull/140)
 
 ### Removed
 - Remove `test_rust` command. (`python setup.py test` is deprecated.) [#129](https://github.com/PyO3/setuptools-rust/pull/129)

setuptools_rust/build.py

@@ -39,6 +39,7 @@ class build_rust(RustCommand):
             "t",
             "directory for temporary files (cargo 'target' directory) ",
         ),
+        ("target", None, "Build for the target triple"),
     ]
     boolean_options = ["inplace", "debug", "release", "qbuild"]
 
@@ -50,6 +51,7 @@ def initialize_options(self):
         self.qbuild = None
         self.build_temp = None
         self.plat_name = None
+        self.target = os.getenv("CARGO_BUILD_TARGET")
 
     def finalize_options(self):
         super().finalize_options()
@@ -66,9 +68,9 @@ def get_target_triple(self):
         # If we are on a 64-bit machine, but running a 32-bit Python, then
         # we'll target a 32-bit Rust build.
         # Automatic target detection can be overridden via the CARGO_BUILD_TARGET
-        # environment variable.
-        if os.getenv("CARGO_BUILD_TARGET"):
-            return os.environ["CARGO_BUILD_TARGET"]
+        # environment variable or --target command line option
+        if self.target:
+            return self.target
         elif self.plat_name == "win32":
             return "i686-pc-windows-msvc"
         elif self.plat_name == "win-amd64":
@@ -166,7 +168,9 @@ def build_extension(self, ext: RustExtension, target_triple=None):
             if quiet:
                 args.append("-q")
             elif self.verbose:
-                args.append("--verbose")
+                # cargo only have -vv
+                verbose_level = 'v' * min(self.verbose, 2)
+                args.append(f"-{verbose_level}")
 
         else:
             args = (
@@ -180,7 +184,9 @@ def build_extension(self, ext: RustExtension, target_triple=None):
             if quiet:
                 args.append("-q")
             elif self.verbose:
-                args.append("--verbose")
+                # cargo only have -vv
+                verbose_level = 'v' * min(self.verbose, 2)
+                args.append(f"-{verbose_level}")
 
             args.extend(["--", "--crate-type", "cdylib"])
             args.extend(ext.rustc_flags or [])

setuptools_rust/setuptools_ext.py

@@ -91,14 +91,24 @@ def make_distribution(self):
     dist.cmdclass["sdist"] = sdist_rust_extension
 
     build_ext_base_class = dist.cmdclass.get('build_ext', build_ext)
+    build_ext_options = build_ext_base_class.user_options.copy()
+    build_ext_options.append(("target", None, "Build for the target triple"))
 
     class build_ext_rust_extension(build_ext_base_class):
+        user_options = build_ext_options
+
+        def initialize_options(self):
+            super().initialize_options()
+            self.target = os.getenv("CARGO_BUILD_TARGET")
+
         def run(self):
             if self.distribution.rust_extensions:
                 log.info("running build_rust")
                 build_rust = self.get_finalized_command("build_rust")
                 build_rust.inplace = self.inplace
                 build_rust.plat_name = self.plat_name
+                build_rust.target = self.target
+                build_rust.verbose = self.verbose
                 build_rust.run()
 
             build_ext_base_class.run(self)
@@ -156,9 +166,17 @@ def finalize_options(self):
 
     if bdist_wheel is not None:
         bdist_wheel_base_class = dist.cmdclass.get("bdist_wheel", bdist_wheel)
+        bdist_wheel_options = bdist_wheel_base_class.user_options.copy()
+        bdist_wheel_options.append(("target", None, "Build for the target triple"))
 
         # this is for console entries
         class bdist_wheel_rust_extension(bdist_wheel_base_class):
+            user_options = bdist_wheel_options
+
+            def initialize_options(self):
+                super().initialize_options()
+                self.target = os.getenv("CARGO_BUILD_TARGET")
+
             def finalize_options(self):
                 scripts = []
                 for ext in self.distribution.rust_extensions: