aboutsummaryrefslogtreecommitdiffstats
path: root/testing/rustup/dont-copy-rustup-bin.patch
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-06-08 12:30:40 +0200
committerLeo <thinkabit.ukim@gmail.com>2019-06-08 09:19:41 -0300
commit0c097652995acff0e1a9892a176f73cb84dd4a74 (patch)
tree9182200600714be48c7612b731ac53695a5873b4 /testing/rustup/dont-copy-rustup-bin.patch
parentc5a8dac6ab18d7fe88ab46d574e97e10010f3709 (diff)
downloadaports-0c097652995acff0e1a9892a176f73cb84dd4a74.tar.bz2
aports-0c097652995acff0e1a9892a176f73cb84dd4a74.tar.xz
testing/rustup: upgrade to 1.18.3
Diffstat (limited to 'testing/rustup/dont-copy-rustup-bin.patch')
-rw-r--r--testing/rustup/dont-copy-rustup-bin.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/testing/rustup/dont-copy-rustup-bin.patch b/testing/rustup/dont-copy-rustup-bin.patch
new file mode 100644
index 0000000000..bcc6f5ce36
--- /dev/null
+++ b/testing/rustup/dont-copy-rustup-bin.patch
@@ -0,0 +1,14 @@
+Upstream: No, not upstreamable like this
+Reason: We want the rustup binary in $CARGO_HOME/bin to be of the
+same version as the one we distribute in this rustup package.
+--- a/src/cli/self_update.rs.1 2018-12-13 21:56:55.211778812 +0100
++++ b/src/cli/self_update.rs 2018-12-13 21:56:42.763779768 +0100
+@@ -619,8 +619,7 @@
+ if rustup_path.exists() {
+ utils::remove_file("rustup-bin", &rustup_path)?;
+ }
+- utils::copy_file(&this_exe_path, &rustup_path)?;
+- utils::make_executable(&rustup_path)?;
++ utils::symlink_file(&this_exe_path, &rustup_path)?;
+ install_proxies()
+ }