diff options
Diffstat (limited to 'community/rust/minimize-rpath.patch')
| -rw-r--r-- | community/rust/minimize-rpath.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/community/rust/minimize-rpath.patch b/community/rust/minimize-rpath.patch index 3ae6a7efe1..1f6682ae26 100644 --- a/community/rust/minimize-rpath.patch +++ b/community/rust/minimize-rpath.patch @@ -46,7 +46,7 @@ and skip it there. // Mac doesn't appear to support $ORIGIN let prefix = if config.is_like_osx { "@loader_path" -@@ -114,11 +117,18 @@ +@@ -114,10 +117,18 @@ let mut output = cwd.join(&config.out_filename); output.pop(); let output = fs::canonicalize(&output).unwrap_or(output); @@ -54,8 +54,7 @@ and skip it there. - panic!("couldn't create relative path from {:?} to {:?}", output, lib)); + // FIXME (#9639): This needs to handle non-utf8 paths -- format!("{}/{}", prefix, -- relative.to_str().expect("non-utf8 component in path")) +- format!("{}/{}", prefix, relative.to_str().expect("non-utf8 component in path")) + let libpath = lib.to_str().expect("non-utf8 component in path").to_string(); + if omit.contains(&libpath) { + None |