Rename unversioned_llvm_target to llvm_target

Since we no longer version the LLVM target, it is no longer that important to call out that the LLVM target is unversioned.
rust-lang · Jan 1, 2025 · 5fc270a · 5fc270a
1 parent 1136a7d
commit 5fc270a
Show file tree

Hide file tree

Showing 5 changed files with 291 additions and 304 deletions.
diff --git a/dev-tools/gen-target-info/src/main.rs b/dev-tools/gen-target-info/src/main.rs
@@ -26,17 +26,9 @@ fn generate_target_mapping(f: &mut File, target_specs: &RustcTargetSpecs) -> std
         let env = spec.env.as_deref().unwrap_or("");
         let abi = spec.abi.as_deref().unwrap_or("");
 
-        let unversioned_llvm_target = if spec.llvm_target.contains("apple") {
-            // Remove deployment target information from LLVM target triples (we
-            // will add this in another part of CC).
-            //
-            // FIXME(madsmtm): Should become unnecessary after
-            // https://github.com/rust-lang/rust/pull/131037
-            let mut components = spec.llvm_target.split("-").collect::<Vec<_>>();
-
-            components[2] = components[2].trim_end_matches(|c: char| c.is_numeric() || c == '.');
-
-            components.join("-")
+        // FIXME(madsmtm): Unnecessary once we bump MSRV to Rust 1.74
+        let llvm_target = if spec.llvm_target == "armv7-apple-ios7.0.0" {
+            "armv7-apple-ios".to_string()
         } else if os == "uefi" {
             // Override the UEFI LLVM targets.
             //
@@ -80,10 +72,7 @@ fn generate_target_mapping(f: &mut File, target_specs: &RustcTargetSpecs) -> std
         writeln!(f, "            os: {os:?},")?;
         writeln!(f, "            env: {env:?},")?;
         writeln!(f, "            abi: {abi:?},")?;
-        writeln!(
-            f,
-            "            unversioned_llvm_target: {unversioned_llvm_target:?},"
-        )?;
+        writeln!(f, "            llvm_target: {llvm_target:?},")?;
         writeln!(f, "        }},")?;
         writeln!(f, "    ),")?;
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -2189,7 +2189,7 @@ impl Build {
                     // and instead pass that via `-mmacosx-version-min=` and similar flags, for
                     // better compatibility with older versions of Clang that has poor support for
                     // versioned target names (especially when it comes to configuration files).
-                    cmd.push_cc_arg(format!("--target={}", target.unversioned_llvm_target).into());
+                    cmd.push_cc_arg(format!("--target={}", target.llvm_target).into());
                 }
             }
             ToolFamily::Msvc { clang_cl } => {
@@ -2205,9 +2205,7 @@ impl Build {
                         cmd.push_cc_arg("-m32".into());
                         cmd.push_cc_arg("-arch:IA32".into());
                     } else {
-                        cmd.push_cc_arg(
-                            format!("--target={}", target.unversioned_llvm_target).into(),
-                        );
+                        cmd.push_cc_arg(format!("--target={}", target.llvm_target).into());
                     }
                 } else if target.full_arch == "i586" {
                     cmd.push_cc_arg("-arch:IA32".into());

diff --git a/src/target.rs b/src/target.rs
@@ -47,7 +47,7 @@ pub(crate) struct TargetInfo<'a> {
     ///
     /// NOTE: You should never need to match on this explicitly, use the other
     /// fields on [`TargetInfo`] instead.
-    pub unversioned_llvm_target: &'a str,
+    pub llvm_target: &'a str,
 }
 
 impl FromStr for TargetInfo<'_> {