Don't output version flag on Clang

It is redundant, the version is already specified in `-target`.

Author: madsmtm

src/lib.rs

@@ -2527,22 +2527,22 @@ impl Build {
     fn apple_flags(&self, cmd: &mut Tool) -> Result<(), Error> {
         let target = self.get_target()?;
 
-        let min_version = self.apple_deployment_target(&target);
-        let version_flag = match (&*target.os, &*target.abi) {
-            ("macos", "") => Some("-mmacosx-version-min"),
-            ("ios", "") => Some("-miphoneos-version-min"),
-            ("ios", "sim") => Some("-mios-simulator-version-min"),
-            ("tvos", "") => Some("-mappletvos-version-min"),
-            ("tvos", "sim") => Some("-mappletvsimulator-version-min"),
-            ("watchos", "") => Some("-mwatchos-version-min"),
-            ("watchos", "sim") => Some("-mwatchsimulator-version-min"),
-            // `-mxros-version-min` does not exist
-            // https://github.com/llvm/llvm-project/issues/88271
-            _ => None,
-        };
-        if let Some(version_flag) = version_flag {
+        // If the compiler is Clang, then we've already specifed the target
+        // information (including the deployment target) with the `--target`
+        // option, so we don't need to do anything further here.
+        //
+        // If the compiler is GCC, then we need to specify
+        // `-mmacosx-version-min` to set the deployment target, as well
+        // as to say that the target OS is macOS.
+        //
+        // NOTE: GCC does not support `-miphoneos-version-min=` etc. (because
+        // it does not support iOS in general), but we specify them anyhow in
+        // case we actually have a Clang-like compiler disguised as a GNU-like
+        // compiler, or in case GCC adds support for these in the future.
+        if !cmd.is_like_clang() {
+            let min_version = self.apple_deployment_target(&target);
             cmd.args
-                .push(format!("{}={}", version_flag, min_version).into());
+                .push(target.apple_version_flag(&min_version).into());
         }
 
         // AppleClang sometimes requires sysroot even on macOS

src/target/apple.rs

@@ -16,4 +16,22 @@ impl TargetInfo {
             (os, _) => panic!("invalid Apple target OS {}", os),
         }
     }
+
+    pub(crate) fn apple_version_flag(&self, min_version: &str) -> String {
+        match (&*self.os, &*self.abi) {
+            ("macos", "") => format!("-mmacosx-version-min={min_version}"),
+            ("ios", "") => format!("-miphoneos-version-min={min_version}"),
+            ("ios", "sim") => format!("-mios-simulator-version-min={min_version}"),
+            ("ios", "macabi") => format!("-mtargetos=ios{min_version}-macabi"),
+            ("tvos", "") => format!("-mappletvos-version-min={min_version}"),
+            ("tvos", "sim") => format!("-mappletvsimulator-version-min={min_version}"),
+            ("watchos", "") => format!("-mwatchos-version-min={min_version}"),
+            ("watchos", "sim") => format!("-mwatchsimulator-version-min={min_version}"),
+            // `-mxros-version-min` does not exist
+            // https://github.com/llvm/llvm-project/issues/88271
+            ("visionos", "") => format!("-mtargetos=xros{min_version}"),
+            ("visionos", "sim") => format!("-mtargetos=xros{min_version}-simulator"),
+            (os, _) => panic!("invalid Apple target OS {}", os),
+        }
+    }
 }

tests/test.rs

@@ -511,7 +511,9 @@ fn gnu_apple_darwin() {
     for (arch, version) in &[("x86_64", "10.7"), ("aarch64", "11.0")] {
         let target = format!("{}-apple-darwin", arch);
         let test = Test::gnu();
-        test.gcc()
+        test.shim("fake-gcc")
+            .gcc()
+            .compiler("fake-gcc")
             .target(&target)
             .host(&target)
             // Avoid test maintenance when minimum supported OSes change.
@@ -520,8 +522,7 @@ fn gnu_apple_darwin() {
             .compile("foo");
 
         let cmd = test.cmd(0);
-        test.cmd(0)
-            .must_have(format!("-mmacosx-version-min={}", version));
+        cmd.must_have(format!("-mmacosx-version-min={version}"));
         cmd.must_not_have("-isysroot");
     }
 }
@@ -553,7 +554,7 @@ fn macos_cpp_minimums() {
         let deployment_arg = exec
             .args
             .iter()
-            .find_map(|arg| arg.strip_prefix("-mmacosx-version-min="))
+            .find_map(|arg| arg.strip_prefix("--target=x86_64-apple-macosx"))
             .expect("no deployment target argument was set");
 
         let mut deployment_parts = deployment_arg.split('.').map(|v| v.parse::<u32>().unwrap());
@@ -581,7 +582,7 @@ fn macos_cpp_minimums() {
         .compile("foo");
 
     // No C++ leaves it untouched
-    test.cmd(0).must_have("-mmacosx-version-min=10.7");
+    test.cmd(0).must_have("--target=x86_64-apple-macosx10.7");
 }
 
 #[cfg(target_os = "macos")]
@@ -596,7 +597,7 @@ fn clang_apple_tvos() {
         .file("foo.c")
         .compile("foo");
 
-    test.cmd(0).must_have("-mappletvos-version-min=9.0");
+    test.cmd(0).must_have("--target=arm64-apple-tvos9.0");
 }
 
 #[cfg(target_os = "macos")]
@@ -648,7 +649,8 @@ fn clang_apple_tvsimulator() {
         .file("foo.c")
         .compile("foo");
 
-    test.cmd(0).must_have("-mappletvsimulator-version-min=9.0");
+    test.cmd(0)
+        .must_have("--target=x86_64-apple-tvos9.0-simulator");
 }
 
 #[cfg(target_os = "macos")]