From 0173c3555d8fbf0e89312b583b2a5607e210ae7a Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 10 Nov 2022 16:14:04 -0700
Subject: [PATCH] Fix paths in llvm and rust recipes
---
recipes/llvm/recipe.toml | 2 +-
recipes/rust/recipe.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/llvm/recipe.toml b/recipes/llvm/recipe.toml
index d7902daae..41e98cf34 100644
--- a/recipes/llvm/recipe.toml
+++ b/recipes/llvm/recipe.toml
@@ -19,7 +19,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
-DCMAKE_INSTALL_INCLUDEDIR="include"
-DCMAKE_INSTALL_OLDINCLUDEDIR="/include"
-DCMAKE_SYSTEM_NAME=Generic
- -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath ../native.cmake)"
+ -DCROSS_TOOLCHAIN_FLAGS_NATIVE="-DCMAKE_TOOLCHAIN_FILE=$(realpath "${COOKBOOK_RECIPE}/native.cmake")"
-DLLVM_BUILD_BENCHMARKS=Off
-DLLVM_BUILD_EXAMPLES=Off
-DLLVM_BUILD_TESTS=Off
diff --git a/recipes/rust/recipe.sh b/recipes/rust/recipe.sh
index be4f36c8c..2d1c4d360 100644
--- a/recipes/rust/recipe.sh
+++ b/recipes/rust/recipe.sh
@@ -15,7 +15,7 @@ function recipe_update {
}
function recipe_build {
- config="$(realpath ../config.toml)"
+ config="$(realpath "${COOKBOOK_RECIPE}/config.toml")"
source="$(realpath ../source)"
unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP
python3 "$source/x.py" install --config "$config" --jobs $(nproc) --incremental
--
GitLab