From be203e38a556a1f4348050061db7ee394649a531 Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:52:54 +0100
Subject: More generic target directory for rust coverage (#5366)

* More generic target directory for rust coverage

* Rust coverage cargo does not change PATH
---
 infra/base-images/base-builder/cargo | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'infra/base-images/base-builder/cargo')

diff --git a/infra/base-images/base-builder/cargo b/infra/base-images/base-builder/cargo
index 79233b60..670c8193 100755
--- a/infra/base-images/base-builder/cargo
+++ b/infra/base-images/base-builder/cargo
@@ -21,8 +21,6 @@
 #
 ################################################################################
 
-export PATH="/rust/bin:$PATH"
-
 if [ "$SANITIZER" = "coverage" ] && [ $1 = "build" ]
 then
     crate_src_abspath=`cargo metadata --no-deps --format-version 1 | jq -r '.workspace_root'`
@@ -41,11 +39,11 @@ then
     # do not optimize with --release, leading to Malformed instrumentation profile data
     cargo build --bins
     # copies the build output in the expected target directory
-    cd target
+    cd `cargo metadata --format-version 1 --no-deps | jq -r '.target_directory'`
     mkdir -p x86_64-unknown-linux-gnu/release
     cp -r debug/* x86_64-unknown-linux-gnu/release/
     )
     exit 0
 fi
 
-cargo "$@"
+/rust/bin/cargo "$@"
-- 
cgit v1.2.3