Revert src/tools/run-make-support/ changes

Author: anforowicz

src/tools/run-make-support/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2024"
 bstr = "1.12"
 gimli = "0.32"
 libc = "0.2"
-object = { version = "0.37", features = ["read", "compression", "wasm"] }
+object = "0.37"
 regex = "1.11"
 serde_json = "1.0"
 similar = "2.7"

src/tools/run-make-support/src/artifact_names.rs

@@ -2,7 +2,7 @@
 //! libraries which are target-dependent.
 
 use crate::target;
-use crate::targets::{is_wasi, is_windows, is_windows_msvc};
+use crate::targets::is_windows_msvc;
 
 /// Construct the static library name based on the target.
 #[track_caller]
@@ -22,24 +22,18 @@ pub fn dynamic_lib_name(name: &str) -> String {
     format!("{}{name}.{}", dynamic_lib_prefix(), dynamic_lib_extension())
 }
 
-/// Returns the value of `DLL_PREFIX` from `library/std/src/sys/env_consts.rs`
-/// for the target platform indicated by `crate::target()`.
 fn dynamic_lib_prefix() -> &'static str {
-    // FIXME: Cover more exotic platform like `uefi`.
-    if is_wasi() || is_windows() { "" } else { "lib" }
+    if target().contains("windows") { "" } else { "lib" }
 }
 
-/// Returns the value of `DLL_EXTENSION` from `library/std/src/sys/env_consts.rs`
-/// for the target platform indicated by `crate::target()`.
+/// Construct the dynamic library extension based on the target.
 #[must_use]
 pub fn dynamic_lib_extension() -> &'static str {
-    // FIXME: Cover more exotic platform like `uefi`.
     let target = target();
+
     if target.contains("apple") {
         "dylib"
-    } else if is_wasi() {
-        "wasm"
-    } else if is_windows() {
+    } else if target.contains("windows") {
         "dll"
     } else if target.contains("aix") {
         "a"

src/tools/run-make-support/src/targets.rs

@@ -34,20 +34,6 @@ pub fn is_win7() -> bool {
     target().contains("win7")
 }
 
-/// Check if target uses WASI
-pub fn is_wasi() -> bool {
-    // The condition below is roughly equivalent to the following `cfg`
-    // attribute from `library/std/src/sys/env_consts.rs`.
-    //
-    // ```
-    // #[cfg(all(
-    //      target_family = "wasm",
-    //      not(any(target_os = "emscripten", target_os = "linux"))
-    // ))]
-    // ```
-    target().starts_with("wasm") && !target().contains("linux") && !target().contains("emscripten")
-}
-
 /// Check if target uses macOS.
 #[must_use]
 pub fn is_darwin() -> bool {