From ebda92aa7fd5f0183dd221107ac5a6a9c91b135f Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 26 Mar 2020 20:48:25 -0600
Subject: [PATCH] Fix xargo deadlock in relibc recipe
---
recipes/relibc/recipe.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/relibc/recipe.sh b/recipes/relibc/recipe.sh
index 7518a071b..87f665e50 100644
--- a/recipes/relibc/recipe.sh
+++ b/recipes/relibc/recipe.sh
@@ -1,12 +1,12 @@
GIT=https://gitlab.redox-os.org/redox-os/relibc.git
function recipe_build {
- make CARGO=xargo -j"$(nproc)"
+ make CARGO="env -u CARGO xargo" -j"$(nproc)"
skip=1
}
function recipe_stage {
dest="$(realpath $1)"
- make CARGO=xargo DESTDIR="$dest" install
+ make CARGO="env -u CARGO xargo" DESTDIR="$dest" install
skip=1
}
--
GitLab