Skip to content

Commit

Permalink
Rollup merge of rust-lang#58346 - RalfJung:rpath-pop, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
rpath computation: explain why we pop()

I was quite confused by this code until I got a debug log of what is going on.
  • Loading branch information
Mark-Simulacrum authored Feb 10, 2019
2 parents 10e3e3c + adb3300 commit 74e450c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/librustc_codegen_llvm/back/rpath.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ fn get_rpath_relative_to_output(config: &mut RPathConfig, lib: &Path) -> String

let cwd = env::current_dir().unwrap();
let mut lib = fs::canonicalize(&cwd.join(lib)).unwrap_or_else(|_| cwd.join(lib));
lib.pop();
lib.pop(); // strip filename
let mut output = cwd.join(&config.out_filename);
output.pop();
output.pop(); // strip filename
let output = fs::canonicalize(&output).unwrap_or(output);
let relative = path_relative_from(&lib, &output).unwrap_or_else(||
panic!("couldn't create relative path from {:?} to {:?}", output, lib));
Expand Down

0 comments on commit 74e450c

Please sign in to comment.