PktSurf
9d657e0a1d
Renamed .SMBuild files to smbuild for simplicity Added musl-fts, musl-obstack, glslang, python-glad, libptytty, libmilter, elfutils and fuse to base section build list Discarded fuse2 and fuse3 from base section Temporarily discarded slapt-get, syslinux, p7zip, acpid, libelf-compat, gnu-eif, libtirpc, mozilla-nss, lua53, qpdf, kernel-source and signify from base section build list Disabled nls and made amends to base/e2fsprogs Upgraded base/git to 2.46.2 Upgraded extra/gnumeric to 1.12.57 Disabled nls in base/gnutls, extra/dia Disabled a patch and made amends in base/llvm Fixed configure.local file in base/mandoc Upgraded base/rust to 1.79 Fixed a ton of build files to use build prefix as /usr and miscellaneous changes Discarded extra/bluez,blueman,scrcpy,adafruit-io Added tomb to extra Added new build option to extra/libass Upgraded extra/mpv to 0.37.0 Disabled tests in gtk/gdk-pixbuf Upgraded gtk/goffice to 0.10.57 Added gtk-doc to gtk section Fixed build options in gtk/gtk2 Added new patches to gtk/gtk3 Added gtksourceview to gtk section Added vulkan-headers to xorg section Upgraded xorg/mesa to 23.1.9 Added libplacebo to xorg section Fixed build stuff in xorg/glew
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
This reverts upstream 5aeb6a326f2fa941061b60c9286665847fe0401e that is
|
|
part of https://github.com/rust-lang/rust/pull/116487
|
|
|
|
Since we always enable `-Crpath` with need-rpath.patch things like running
|
|
`rustc hello_world.rs` would break, as we noticed with our check-rustc
|
|
test.
|
|
|
|
Related issue: https://github.com/rust-lang/rust/issues/119571
|
|
|
|
--- a/compiler/rustc_codegen_ssa/src/back/rpath.rs
|
|
+++ b/compiler/rustc_codegen_ssa/src/back/rpath.rs
|
|
@@ -1,7 +1,8 @@
|
|
use pathdiff::diff_paths;
|
|
use rustc_data_structures::fx::FxHashSet;
|
|
-use rustc_fs_util::try_canonicalize;
|
|
+use std::env;
|
|
use std::ffi::OsString;
|
|
+use std::fs;
|
|
use std::path::{Path, PathBuf};
|
|
|
|
pub struct RPathConfig<'a> {
|
|
@@ -81,11 +82,12 @@ fn get_rpath_relative_to_output(config:
|
|
// Mac doesn't appear to support $ORIGIN
|
|
let prefix = if config.is_like_osx { "@loader_path" } else { "$ORIGIN" };
|
|
|
|
- // Strip filenames
|
|
- let lib = lib.parent().unwrap();
|
|
- let output = config.out_filename.parent().unwrap();
|
|
- let lib = try_canonicalize(lib).unwrap();
|
|
- let output = try_canonicalize(output).unwrap();
|
|
+ let cwd = env::current_dir().unwrap();
|
|
+ let mut lib = fs::canonicalize(&cwd.join(lib)).unwrap_or_else(|_| cwd.join(lib));
|
|
+ lib.pop(); // strip filename
|
|
+ let mut output = cwd.join(&config.out_filename);
|
|
+ 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 {output:?} to {lib:?}"));
|
|
|