rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Simplify current_dll_path for Cygwin

Browse Source
This commit is contained in:
Berrysoft
2025-05-16 09:41:52 +08:00
parent 12fda865f2
commit 5e048e0786
1 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/rustc_session/src/filesearch.rs
View File

@@ -58,7 +58,7 @@ pub fn make_target_bin_path(sysroot: &Path, target_triple: &str) -> PathBuf {
sysroot.join(rustlib_path).join("bin") sysroot.join(rustlib_path).join("bin")
} }
#[cfg(all(unix, not(target_os = "cygwin")))] #[cfg(unix)]
fn current_dll_path() -> Result<PathBuf, String> { fn current_dll_path() -> Result<PathBuf, String> {
use std::sync::OnceLock; use std::sync::OnceLock;
@@ -78,10 +78,16 @@ fn current_dll_path() -> Result<PathBuf, String> {
if libc::dladdr(addr, &mut info) == 0 { if libc::dladdr(addr, &mut info) == 0 {
return Err("dladdr failed".into()); return Err("dladdr failed".into());
} }
#[cfg(target_os = "cygwin")]
let fname_ptr = info.dli_fname.as_ptr();
#[cfg(not(target_os = "cygwin"))]
let fname_ptr = {
if info.dli_fname.is_null() { if info.dli_fname.is_null() {
return Err("dladdr returned null pointer".into()); return Err("dladdr returned null pointer".into());
} }
let bytes = CStr::from_ptr(info.dli_fname).to_bytes(); info.dli_fname
};
let bytes = CStr::from_ptr(fname_ptr).to_bytes();
let os = OsStr::from_bytes(bytes); let os = OsStr::from_bytes(bytes);
Ok(PathBuf::from(os)) Ok(PathBuf::from(os))
} }
@@ -132,23 +138,6 @@ fn current_dll_path() -> Result<PathBuf, String> {
.clone() .clone()
} }
#[cfg(target_os = "cygwin")]
fn current_dll_path() -> Result<PathBuf, String> {
use std::ffi::{CStr, OsStr};
use std::os::unix::prelude::*;
unsafe {
let addr = current_dll_path as usize as *mut _;
let mut info = std::mem::zeroed();
if libc::dladdr(addr, &mut info) == 0 {
return Err("dladdr failed".into());
}
let bytes = CStr::from_ptr(info.dli_fname.as_ptr()).to_bytes();
let os = OsStr::from_bytes(bytes);
Ok(PathBuf::from(os))
}
}
#[cfg(windows)] #[cfg(windows)]
fn current_dll_path() -> Result<PathBuf, String> { fn current_dll_path() -> Result<PathBuf, String> {
use std::ffi::OsString; use std::ffi::OsString;