user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port symlinked-libraries to rmake

Browse source
This commit is contained in:
Oneirical 2024-05-28 13:57:09 -04:00
parent 59acd23457
commit 2ac5faa509
6 changed files with 50 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/tools/run-make-support/src/lib.rs
View file

@ -94,14 +94,31 @@ pub fn source_root() -> PathBuf {
}
/// Creates a new symlink to a path on the filesystem, adjusting for Windows or Unix.
#[cfg(target_family = "windows")]
pub fn create_symlink<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) {
if is_windows() {
use std::os::windows::fs;
fs::symlink_file(original, link).unwrap();
} else {
use std::os::unix::fs;
fs::symlink(original, link).unwrap();
if link.as_ref().exists() {
std::fs::remove_dir(link.as_ref()).unwrap();
}
use std::os::windows::fs;
fs::symlink_file(original.as_ref(), link.as_ref()).expect(&format!(
"failed to create symlink {:?} for {:?}",
link.as_ref().display(),
original.as_ref().display(),
));
}
/// Creates a new symlink to a path on the filesystem, adjusting for Windows or Unix.
#[cfg(target_family = "unix")]
pub fn create_symlink<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) {
if link.as_ref().exists() {
std::fs::remove_dir(link.as_ref()).unwrap();
}
use std::os::unix::fs;
fs::symlink(original.as_ref(), link.as_ref()).expect(&format!(
"failed to create symlink {:?} for {:?}",
link.as_ref().display(),
original.as_ref().display(),
));
}
/// Construct the static library name based on the platform.
@ -125,11 +142,7 @@ pub fn static_lib_name(name: &str) -> String {
// ```
assert!(!name.contains(char::is_whitespace), "static library name cannot contain whitespace");
if is_msvc() {
format!("{name}.lib")
} else {
format!("lib{name}.a")
}
if is_msvc() { format!("{name}.lib") } else { format!("lib{name}.a") }
}
/// Construct the dynamic library name based on the platform.
@ -176,11 +189,7 @@ pub fn rust_lib_name(name: &str) -> String {
/// Construct the binary name based on platform.
pub fn bin_name(name: &str) -> String {
if is_windows() {
format!("{name}.exe")
} else {
name.to_string()
}
if is_windows() { format!("{name}.exe") } else { name.to_string() }
}
/// Return the current working directory.

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View file

@ -228,7 +228,6 @@ run-make/std-core-cycle/Makefile
run-make/symbol-mangling-hashed/Makefile
run-make/symbol-visibility/Makefile
run-make/symbols-include-type-name/Makefile
run-make/symlinked-libraries/Makefile
run-make/sysroot-crates-are-unstable/Makefile
run-make/target-cpu-native/Makefile
run-make/target-specs/Makefile