diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-20 10:23:04 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-20 16:46:01 +0200 |
| commit | 207941559ddce18b7b0cfeb09b7fab673233c4da (patch) | |
| tree | c28ef0367037839b5b0a071574b90f8eac7c96c4 /community/rust/need-rpath.patch | |
| parent | 3dc0c1d65c029cef8d5252f3d957c64b196c35db (diff) | |
| download | aports-207941559ddce18b7b0cfeb09b7fab673233c4da.tar.bz2 aports-207941559ddce18b7b0cfeb09b7fab673233c4da.tar.xz | |
community/rust: upgrade to 1.26.0
Also switch to LLVM 5. Upstream switched right to LLVM 6, but we
don't have it yet.
Diffstat (limited to 'community/rust/need-rpath.patch')
| -rw-r--r-- | community/rust/need-rpath.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/community/rust/need-rpath.patch b/community/rust/need-rpath.patch index 88cc9d8882..d7689610b9 100644 --- a/community/rust/need-rpath.patch +++ b/community/rust/need-rpath.patch @@ -13,7 +13,7 @@ Hacky hacky! --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs -@@ -341,6 +341,8 @@ +@@ -379,6 +379,8 @@ pub allows_weak_linkage: bool, /// Whether the linker support rpaths or not. Defaults to false. pub has_rpath: bool, @@ -22,7 +22,7 @@ Hacky hacky! /// Whether to disable linking to the default libraries, typically corresponds /// to `-nodefaultlibs`. Defaults to true. pub no_default_libraries: bool, -@@ -434,6 +436,7 @@ +@@ -519,6 +519,7 @@ linker_is_gnu: false, allows_weak_linkage: true, has_rpath: false, @@ -30,7 +30,7 @@ Hacky hacky! no_default_libraries: true, position_independent_executables: false, static_position_independent_executables: false, -@@ -616,6 +616,7 @@ +@@ -776,6 +776,7 @@ key!(linker_is_gnu, bool); key!(allows_weak_linkage, bool); key!(has_rpath, bool); @@ -38,7 +38,7 @@ Hacky hacky! key!(no_default_libraries, bool); key!(position_independent_executables, bool); key!(static_position_independent_executables, bool); -@@ -781,6 +782,7 @@ +@@ -980,6 +980,7 @@ target_option_val!(linker_is_gnu); target_option_val!(allows_weak_linkage); target_option_val!(has_rpath); @@ -48,7 +48,7 @@ Hacky hacky! target_option_val!(static_position_independent_executables); --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs -@@ -901,7 +901,10 @@ +@@ -1092,7 +1092,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 @@ -58,5 +58,5 @@ Hacky hacky! + if !bootstrap && !sess.crt_static() && + (sess.opts.cg.rpath || sess.target.target.options.need_rpath) { let sysroot = sess.sysroot(); - let target_triple = &sess.opts.target_triple; + let target_triple = sess.opts.target_triple.triple(); let mut get_install_prefix_lib_path = || { |