rustup: 1.11.0 -> 1.13.0
This commit is contained in:
@@ -4,29 +4,26 @@ Date: Sat, 28 Oct 2017 17:58:17 +0200
|
||||
Subject: [PATCH] nix customization: patchelf installed binaries
|
||||
|
||||
---
|
||||
src/rustup-dist/src/component/package.rs | 24 +++++++++++++++++++++++-
|
||||
1 file changed, 23 insertions(+), 1 deletion(-)
|
||||
src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++-
|
||||
1 file changed, 20 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
|
||||
index 8aa63db9..4d219826 100644
|
||||
index 70c54dcd..f0318986 100644
|
||||
--- a/src/rustup-dist/src/component/package.rs
|
||||
+++ b/src/rustup-dist/src/component/package.rs
|
||||
@@ -99,7 +99,13 @@ impl Package for DirectoryPackage {
|
||||
@@ -100,7 +100,10 @@ impl Package for DirectoryPackage {
|
||||
let src_path = root.join(&path);
|
||||
|
||||
match &*part.0 {
|
||||
- "file" => try!(builder.copy_file(path.clone(), &src_path)),
|
||||
- "file" => builder.copy_file(path.clone(), &src_path)?,
|
||||
+ "file" => {
|
||||
+ try!(builder.copy_file(path.clone(), &src_path));
|
||||
+ nix_patchelf_if_needed(
|
||||
+ &target.prefix().path().join(path.clone()),
|
||||
+ &src_path,
|
||||
+ )
|
||||
+ builder.copy_file(path.clone(), &src_path)?;
|
||||
+ nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
|
||||
+ }
|
||||
"dir" => try!(builder.copy_dir(path.clone(), &src_path)),
|
||||
"dir" => builder.copy_dir(path.clone(), &src_path)?,
|
||||
_ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
|
||||
}
|
||||
@@ -117,6 +123,22 @@ impl Package for DirectoryPackage {
|
||||
@@ -118,6 +121,22 @@ impl Package for DirectoryPackage {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,5 +47,5 @@ index 8aa63db9..4d219826 100644
|
||||
// binaries are executable and directories readable. This shouldn't be
|
||||
// necessary: the source files *should* have the right permissions,
|
||||
--
|
||||
2.14.1
|
||||
2.17.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user