From 036cba5208cb1570c48bb65063126e386925597f Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:07:47 +0100
Subject: [PATCH] Use cargo env vars to build drivers with opt-level=s and
 panic=abort

---
 recipes/core/drivers-initfs/recipe.toml | 10 ++++------
 recipes/core/drivers/recipe.toml        | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/recipes/core/drivers-initfs/recipe.toml b/recipes/core/drivers-initfs/recipe.toml
index 0f6fd6a97..3d10a4175 100644
--- a/recipes/core/drivers-initfs/recipe.toml
+++ b/recipes/core/drivers-initfs/recipe.toml
@@ -47,15 +47,13 @@ case "${TARGET}" in
 esac
 
 mkdir -pv "${COOKBOOK_STAGE}/bin"
+export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
+export CARGO_PROFILE_RELEASE_PANIC=abort
 for bin in "${BINS[@]}"
 do
-    "${COOKBOOK_CARGO}" rustc --release \
+    "${COOKBOOK_CARGO}" build --release \
         --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-        -p "${bin}" \
-        --bin "${bin}" \
-        -- \
-        -C opt-level=s \
-        -C panic=abort
+        -p "${bin}"
     cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
 done
 
diff --git a/recipes/core/drivers/recipe.toml b/recipes/core/drivers/recipe.toml
index 076d703e2..024306fe4 100644
--- a/recipes/core/drivers/recipe.toml
+++ b/recipes/core/drivers/recipe.toml
@@ -32,15 +32,13 @@ esac
 
 #Build each driver in the list
 mkdir -pv "${COOKBOOK_STAGE}/bin"
+export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
+export CARGO_PROFILE_RELEASE_PANIC=abort
 for bin in "${BINS[@]}"
 do
-    "${COOKBOOK_CARGO}" rustc --release \
+    "${COOKBOOK_CARGO}" build --release \
         --manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
-        -p "${bin}" \
-        --bin "${bin}" \
-        -- \
-        -C opt-level=s \
-        -C panic=abort
+        -p "${bin}"
     cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
 done