Update target specs (remove os=unknown, add crt-static-respected).

eddyb · eddyb · commit a927d80a5a8a · 2025-05-29T20:35:48.000+03:00
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.0.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.0.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.1.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.1.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.2.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.2.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.3.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.3.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.5.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-opengl4.5.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.0.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.0.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.1.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.1.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.2.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.2.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.3.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.3.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.4.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.4.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.5.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.5.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.0.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.0.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.1.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.1.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.1spv1.4.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.1spv1.4.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.2.json b/crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.2.json
@@ -3,6 +3,7 @@
   "arch": "spirv",
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
+  "crt-static-respected": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
@@ -19,7 +20,6 @@
     "std": null,
     "tier": null
   },
-  "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,
   "target-pointer-width": "32"
diff --git a/crates/rustc_codegen_spirv/src/target.rs b/crates/rustc_codegen_spirv/src/target.rs
@@ -80,13 +80,13 @@ impl SpirvTarget {
         o.simd_types_indirect = false;
         o.allows_weak_linkage = false;
         o.crt_static_allows_dylibs = true;
+        o.crt_static_respected = true;
         o.dll_prefix = "".into();
         o.dll_suffix = ".spv.json".into();
         o.dynamic_linking = true;
         o.emit_debug_gdb_scripts = false;
         o.linker_flavor = LinkerFlavor::Unix(Cc::No);
         o.panic_strategy = PanicStrategy::Abort;
-        o.os = "unknown".into();
         o.env = self.env.to_string().into();
         o.vendor = self.vendor.clone().into();
         // TODO: Investigate if main_needs_argc_argv is useful (for building exes)
