Skip to content

Rollup of 10 pull requests #139746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Apr 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0acac2c
std: Fix build for NuttX targets
thaliaarchi Mar 26, 2025
15e1a66
Use -C target-cpu=z13 on s390x vector test
fneddy Mar 31, 2025
44d1d86
libtest: Pass the test's panic payload as Option instead of Result
Zalathar Apr 8, 2025
7711688
update miniz_oxide to 0.8.8
oyvindln Apr 9, 2025
0ca3127
compiletest: Make `SUGGESTION` annotations viral
petrochenkov Apr 10, 2025
909b6c9
compiletest: Turn `TestProps::require_annotations` into a set
petrochenkov Apr 10, 2025
ad72ba2
dev-guide: Document `dont-require-annotations`
petrochenkov Apr 10, 2025
06dd9e2
compiletest: Trim the value of `dont-require-annotations`
petrochenkov Apr 10, 2025
dc0fbca
Fix profiler_builtins build script to handle full path to profiler lib
Apr 11, 2025
b613e97
Use with_native_path for Windows
ChrisDenton Apr 11, 2025
6ffebb6
Move args into std::sys
thaliaarchi Apr 12, 2025
e014fd6
Use unsupported args for espidf and vita
thaliaarchi Apr 12, 2025
bea2022
Unify owned Args types between platforms
thaliaarchi Apr 12, 2025
6ba9649
End all lines in src/stage0 with trailing newline
dtolnay Apr 12, 2025
5d90ccb
Move `select_unpredictable` to the `hint` module
Amanieu Apr 12, 2025
9d2d6a0
Rollup merge of #138972 - thaliaarchi:nuttx-build, r=Mark-Simulacrum
ChrisDenton Apr 13, 2025
f1b31ae
Rollup merge of #139177 - fneddy:fix_s390x_codegen_bswap, r=Mark-Simu…
ChrisDenton Apr 13, 2025
bde65bd
Rollup merge of #139511 - Zalathar:panic-payload, r=Mark-Simulacrum
ChrisDenton Apr 13, 2025
cc9420f
Rollup merge of #139605 - oyvindln:update_miniz_oxide_0_8, r=Mark-Sim…
ChrisDenton Apr 13, 2025
423e7b8
Rollup merge of #139618 - petrochenkov:virsugg, r=jieyouxu
ChrisDenton Apr 13, 2025
f2a2135
Rollup merge of #139677 - jchecahi:profiler-builtin-rtlib-path-fix, r…
ChrisDenton Apr 13, 2025
8a6d6f5
Rollup merge of #139683 - ChrisDenton:windows-with-native, r=tgross35…
ChrisDenton Apr 13, 2025
daed9e2
Rollup merge of #139710 - thaliaarchi:move-args-pal, r=joboet
ChrisDenton Apr 13, 2025
54aff1f
Rollup merge of #139721 - dtolnay:stage0newline, r=onur-ozkan
ChrisDenton Apr 13, 2025
f1d0b9c
Rollup merge of #139726 - Amanieu:select_unpredictable_hint, r=dtolnay
ChrisDenton Apr 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix profiler_builtins build script to handle full path to profiler lib
LLVM_PROFILER_RT_LIB may be set to an absolute path (e.g., in Fedora builds),
but `-l` expects a library name, not a path. After #138273, this caused builds
to fail with a "could not find native static library" error.

This patch updates the build script to split the path into directory and
filename, using `cargo::rustc-link-search` for the directory and
`cargo::rustc-link-lib=+verbatim` for the file. This allows profiler_builtins to
correctly link the static library even when an absolute path is provided.
  • Loading branch information
Jesus Checa Hidalgo committed Apr 11, 2025
commit dc0fbcab7e0673afe62b3e8e74905d9e5f5b74a4
10 changes: 8 additions & 2 deletions library/profiler_builtins/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ use std::path::PathBuf;

fn main() {
if let Ok(rt) = tracked_env_var("LLVM_PROFILER_RT_LIB") {
println!("cargo::rustc-link-lib=static:+verbatim={rt}");
return;
let rt = PathBuf::from(rt);
if let Some(lib) = rt.file_name() {
if let Some(dir) = rt.parent() {
println!("cargo::rustc-link-search=native={}", dir.display());
}
println!("cargo::rustc-link-lib=static:+verbatim={}", lib.to_str().unwrap());
return;
}
}

let target_os = env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS was not set");
Expand Down
Loading