Remove deprecated --universal2 cli option (#1620)

PyO3 · May 22, 2023 · c2c9e70 · c2c9e70
1 parent 701e3ae
commit c2c9e70
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 27 deletions.
diff --git a/guide/src/develop.md b/guide/src/develop.md
@@ -89,7 +89,7 @@ Options:
           Outputs a future incompatibility report at the end of the build (unstable)
 
   -h, --help
-          Print help information (use `-h` for a summary)
+          Print help (see a summary with '-h')
 ```
 
 ## PEP 660 Editable Installs

diff --git a/guide/src/distribution.md b/guide/src/distribution.md
@@ -126,10 +126,6 @@ Options:
 
           Make sure you installed zig with `pip install maturin[zig]`
 
-      --universal2
-          Control whether to build universal2 wheel for macOS or not. Only applies to macOS targets,
-          do nothing otherwise
-
   -q, --quiet
           Do not print cargo log messages
 
@@ -190,7 +186,7 @@ Options:
           Outputs a future incompatibility report at the end of the build (unstable)
 
   -h, --help
-          Print help information (use `-h` for a summary)
+          Print help (see a summary with '-h')
 ```
 
 ### Cross Compiling

diff --git a/src/build_options.rs b/src/build_options.rs
@@ -185,11 +185,6 @@ pub struct BuildOptions {
     #[arg(long)]
     pub zig: bool,
 
-    /// Control whether to build universal2 wheel for macOS or not.
-    /// Only applies to macOS targets, do nothing otherwise.
-    #[arg(long)]
-    pub universal2: bool,
-
     /// Cargo build options
     #[command(flatten)]
     pub cargo: CargoOptions,
@@ -510,13 +505,7 @@ impl BuildOptions {
 
         let mut target_triple = self.target.clone();
 
-        let mut universal2 = self.universal2;
-        if universal2 {
-            eprintln!("⚠️  Warning: `--universal2` is deprecated, use `--target universal2-apple-darwin` instead");
-        } else if target_triple.as_deref() == Some("universal2-apple-darwin") {
-            universal2 = true;
-            target_triple = None;
-        }
+        let mut universal2 = target_triple.as_deref() == Some("universal2-apple-darwin");
         // Also try to determine universal2 from ARCHFLAGS environment variable
         if let Ok(arch_flags) = env::var("ARCHFLAGS") {
             let arches: HashSet<&str> = arch_flags
@@ -541,6 +530,9 @@ impl BuildOptions {
                 _ => {}
             }
         };
+        if universal2 {
+            target_triple = None;
+        }
 
         let target = Target::from_target_triple(target_triple)?;
 

diff --git a/src/develop.rs b/src/develop.rs
@@ -60,7 +60,6 @@ pub fn develop(
         skip_auditwheel: false,
         #[cfg(feature = "zig")]
         zig: false,
-        universal2: false,
         cargo: CargoOptions {
             target: target_triple,
             ..cargo_options

diff --git a/tests/cmd/build.stdout b/tests/cmd/build.stdout
@@ -56,10 +56,6 @@ Options:
 
           Make sure you installed zig with `pip install maturin[zig]`
 
-      --universal2
-          Control whether to build universal2 wheel for macOS or not. Only applies to macOS targets,
-          do nothing otherwise
-
   -q, --quiet
           Do not print cargo log messages
 

diff --git a/tests/cmd/publish.stdout b/tests/cmd/publish.stdout
@@ -90,10 +90,6 @@ Options:
 
           Make sure you installed zig with `pip install maturin[zig]`
 
-      --universal2
-          Control whether to build universal2 wheel for macOS or not. Only applies to macOS targets,
-          do nothing otherwise
-
   -q, --quiet
           Do not print cargo log messages