From cf861a663a921a0e7fcd0c28e7f2900075fb8981 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 14 Jul 2021 12:24:18 -0600
Subject: [PATCH] Use cargo instead of xargo for rust-cairo and rust-cairo-demo
---
recipes/rust-cairo-demo/recipe.sh | 2 +-
recipes/rust-cairo/recipe.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/rust-cairo-demo/recipe.sh b/recipes/rust-cairo-demo/recipe.sh
index 3b2aff834..13e373e65 100644
--- a/recipes/rust-cairo-demo/recipe.sh
+++ b/recipes/rust-cairo-demo/recipe.sh
@@ -4,7 +4,7 @@ BUILD_DEPENDS=(cairo expat fontconfig freetype libpng pixman zlib)
function recipe_build {
sysroot="$(realpath ../sysroot)"
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
- xargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
+ cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-- \
-L "${sysroot}/lib" \
-l cairo \
diff --git a/recipes/rust-cairo/recipe.sh b/recipes/rust-cairo/recipe.sh
index 8de117da2..b44846398 100644
--- a/recipes/rust-cairo/recipe.sh
+++ b/recipes/rust-cairo/recipe.sh
@@ -5,7 +5,7 @@ CARGOFLAGS="--example gui"
function recipe_build {
sysroot="$(realpath ../sysroot)"
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
- xargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
+ cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-- \
-L "${sysroot}/lib" \
-l cairo \
--
GitLab