diff options
Diffstat (limited to 'community/rust/need-rpath.patch')
| -rw-r--r-- | community/rust/need-rpath.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/community/rust/need-rpath.patch b/community/rust/need-rpath.patch index c86f437d50..6a997c41b6 100644 --- a/community/rust/need-rpath.patch +++ b/community/rust/need-rpath.patch @@ -46,9 +46,9 @@ Hacky hacky! target_option_val!(no_default_libraries); target_option_val!(position_independent_executables); target_option_val!(static_position_independent_executables); ---- a/src/librustc_codegen_llvm/back/link.rs -+++ b/src/librustc_codegen_llvm/back/link.rs -@@ -1092,7 +1092,10 @@ +--- a/src/librustc_codegen_llvm/back/link.rs.orig 2019-05-23 17:57:22.587173355 +0200 ++++ b/src/librustc_codegen_llvm/back/link.rs 2019-05-23 17:58:28.833841560 +0200 +@@ -1018,7 +1018,10 @@ // FIXME (#2397): At some point we want to rpath our guesses as to // where extern libraries might live, based on the // addl_lib_search_paths @@ -56,7 +56,7 @@ Hacky hacky! + // XXX: hacky hacky + let bootstrap = env::var("RUSTC_BOOTSTRAP").is_ok(); + if !bootstrap && !sess.crt_static() && -+ (sess.opts.cg.rpath || sess.target.target.options.need_rpath) { - let sysroot = sess.sysroot(); ++ (sess.opts.cg.rpath || sess.target.target.options.need_rpath) { let target_triple = sess.opts.target_triple.triple(); let mut get_install_prefix_lib_path = || { + let install_prefix = option_env!("CFG_PREFIX").expect("CFG_PREFIX"); |