diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2019-07-07 22:34:53 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-08-30 02:59:13 -0300 |
| commit | 6c8381ba967cd3842484965f3f7c1200a42a5539 (patch) | |
| tree | f2f504337d74d67be7ecd204e8d3ec531139b602 /community/rust/minimize-rpath.patch | |
| parent | 7184ba0dd972247e83d1e0204c1f43c247ad84e5 (diff) | |
| download | aports-6c8381ba967cd3842484965f3f7c1200a42a5539.tar.bz2 aports-6c8381ba967cd3842484965f3f7c1200a42a5539.tar.xz | |
community/rust: upgrade to 1.37.0, enable on aarch64&x86 again
Use upstream triplets for now, rust doesn't seem to want to work with our
triplets...
See https://github.com/rust-lang/rust/issues/62447
Diffstat (limited to 'community/rust/minimize-rpath.patch')
| -rw-r--r-- | community/rust/minimize-rpath.patch | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/community/rust/minimize-rpath.patch b/community/rust/minimize-rpath.patch index 442e6698e7..ccc9ccae59 100644 --- a/community/rust/minimize-rpath.patch +++ b/community/rust/minimize-rpath.patch @@ -66,34 +66,35 @@ and skip it there. } // This routine is adapted from the *old* Path's `path_relative_from` -@@ -227,6 +236,7 @@ - #[test] - fn test_rpath_relative() { - if cfg!(target_os = "macos") { -+ let omit = Vec::new(); - let config = &mut RPathConfig { - used_crates: Vec::new(), - has_rpath: true, -@@ -236,9 +246,11 @@ - get_install_prefix_lib_path: &mut || panic!(), - }; - let res = get_rpath_relative_to_output(config, -- Path::new("lib/libstd.so")); -+ Path::new("lib/libstd.so"), -+ &omit); - assert_eq!(res, "@loader_path/../lib"); - } else { -+ let omit = Vec::new(); - let config = &mut RPathConfig { - used_crates: Vec::new(), - out_filename: PathBuf::from("bin/rustc"), -@@ -248,7 +260,8 @@ - linker_is_gnu: true, - }; - let res = get_rpath_relative_to_output(config, -- Path::new("lib/libstd.so")); -+ Path::new("lib/libstd.so"), -+ &omit); - assert_eq!(res, "$ORIGIN/../lib"); - } +--- a/src/librustc_codegen_ssa/back/rpath/tests.rs ++++ b/src/librustc_codegen_ssa/back/rpath/tests.rs +@@ -50,6 +50,8 @@ + + #[test] + fn test_rpath_relative() { ++ let omit = Vec::new(); ++ + if cfg!(target_os = "macos") { + let config = &mut RPathConfig { + used_crates: Vec::new(), +@@ -60,7 +62,8 @@ + get_install_prefix_lib_path: &mut || panic!(), + }; + let res = get_rpath_relative_to_output(config, +- Path::new("lib/libstd.so")); ++ Path::new("lib/libstd.so"), ++ &omit); + assert_eq!(res, "@loader_path/../lib"); + } else { + let config = &mut RPathConfig { +@@ -72,7 +75,8 @@ + linker_is_gnu: true, + }; + let res = get_rpath_relative_to_output(config, +- Path::new("lib/libstd.so")); ++ Path::new("lib/libstd.so"), ++ &omit); + assert_eq!(res, "$ORIGIN/../lib"); } + } + |