From b761fb3d4bdc8c550474907c58f9ddea06ba02a3 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Tue, 8 Mar 2022 07:30:47 +0200
Subject: hack to use rustup cargo

Sponsored-by: author
---
 ci-prod.ick | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ci-prod.ick b/ci-prod.ick
index 5c150c5..1492f7c 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -1199,6 +1199,11 @@ pipelines:
           type --all cargo
           (cd src && cargo read-manifest)
 
+          # Force use of rustup cargo instead of cargo as packaged by
+          # Debian. dh-cargo hardcodes /usr/bin/cargo.
+          mv /usr/bin/cargo /usr/bin/cargo.debian
+          ln -nsf /workspace/.cargo/bin/cargo /usr/bin/cargo
+
           rm -f ./*_*.*
           cd /workspace/src
           git clean -fdx -e target
@@ -1236,6 +1241,11 @@ pipelines:
               exit 1
           fi
 
+          # Undo previous hack.
+          rm /usr/bin/cargo
+          mv /usr/bin/cargo.debian /usr/bin/cargo
+
+
   - pipeline: rust_run_check_if_there
     actions:
       - where: container
-- 
cgit v1.2.1