From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 14 Jul 2022 11:17:38 +0000 (+0200)
Subject: Install symlinks as-is, don't dereference them
X-Git-Tag: archive/raspbian/1.93.1+dfsg1-2+rpi1^2~27
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eac482099d84c3f9c08fe4b5d2bd54b63d70b887;p=rustc.git

Install symlinks as-is, don't dereference them

Our patch to mdbook installs symlinks to systems versions of font-awesome,
highlight, etc. Upstream mdbook otherwise doesn't use symlinks, so this
doesn't affect anything else that's already generated.

Forwarded: not-needed

Gbp-Pq: Topic build
Gbp-Pq: Name d-bootstrap-install-symlinks.patch
---

diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh
index c4f0c618a5..b7f095918d 100644
--- a/src/tools/rust-installer/install-template.sh
+++ b/src/tools/rust-installer/install-template.sh
@@ -610,7 +610,13 @@ install_components() {
 
             maybe_backup_path "$_file_install_path"
 
+            # Debian copy symlinks as-is, instead of dereferencing them
+            if [ -h "$_src_dir/$_component/$_file" ]
+            then
+            run cp -d "$_src_dir/$_component/$_file" "$_file_install_path"
+            else
             run cp "$_src_dir/$_component/$_file" "$_file_install_path"
+            fi
             if $_is_bin || test -x "$_src_dir/$_component/$_file"; then
                 run chmod 755 "$_file_install_path"
             else
@@ -630,7 +636,7 @@ install_components() {
 
             maybe_backup_path "$_file_install_path"
 
-            run cp -R "$_src_dir/$_component/$_file" "$_file_install_path"
+            run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path"
             critical_need_ok "failed to copy directory"
 
                     # Set permissions. 0755 for dirs, 644 for files