Skip to content

Commit

Permalink
use latest Aya's bpf-linker
Browse files Browse the repository at this point in the history
Signed-off-by: Quentin JEROME <[email protected]>
  • Loading branch information
qjerome committed Oct 6, 2023
1 parent 3bbb8ef commit 9e03e6a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
1 change: 0 additions & 1 deletion xtask/src/ebpf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ impl BuildOptions {
"-C link-arg=--dump-module",
dump_dir.to_string_lossy().as_ref(),
),
("-C link-arg=--llvm-args=--cold-callsite-rel-freq", "0"),
] {
if rustflags.iter().find(|s| s.contains(opt)).is_none() {
rustflags.push(format!("{opt}={value}").into())
Expand Down
3 changes: 2 additions & 1 deletion xtask/src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ pub fn pull<P: AsRef<Path>>(repo: &str, outdir: P) -> Result<(), anyhow::Error>
Ok(())
}

pub fn checkout<P: AsRef<Path>>(project: P, commit: &str) -> Result<(), anyhow::Error> {
pub fn checkout<P: AsRef<Path>, S: AsRef<str>>(project: P, commit: S) -> Result<(), anyhow::Error> {
let project = project.as_ref();
let commit = commit.as_ref();

let status = std::process::Command::new("git")
.current_dir(project)
Expand Down
6 changes: 2 additions & 4 deletions xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,8 @@ fn main() -> Result<(), anyhow::Error> {
// linker branch supporting Debug Information (DI)
let linker_repo = "https://github.com/aya-rs/bpf-linker.git";
let linker_branch = "feature/fix-di";
// we tight the linker to a specific commit id so that we don't get surprises
// NB: when updating this commit in particular also remove the cold callsite disabling build
// option from linker args
let linker_commit = "a79d26c1293a88a26adc1a0d3e605dd88ee7d5fc";
// be carefull of rebased repository while taking commits
let linker_commit = git::last_commit_id(linker_repo, linker_branch)?;

if opts.action_cache_key {
print!(
Expand Down

0 comments on commit 9e03e6a

Please sign in to comment.