From 802c162cc0fb95c13657bdba218a384db257b412 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Wed, 31 Dec 2025 04:11:30 +0000 Subject: [PATCH] Just overwrite config.toml --- recipes/dev/rust/config.toml | 1 - recipes/dev/rust/recipe.toml | 15 +++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/recipes/dev/rust/config.toml b/recipes/dev/rust/config.toml index 58840268..4418c3dd 100644 --- a/recipes/dev/rust/config.toml +++ b/recipes/dev/rust/config.toml @@ -1,4 +1,3 @@ -# Note: this file is not tracked by cookbook, run `make c.rust` after change. [llvm] download-ci-llvm = false static-libstdcpp = false diff --git a/recipes/dev/rust/recipe.toml b/recipes/dev/rust/recipe.toml index c8cce01f..dadb3e1d 100644 --- a/recipes/dev/rust/recipe.toml +++ b/recipes/dev/rust/recipe.toml @@ -39,12 +39,9 @@ export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS="${RUSTFLAGS_BOOTSTRAP}" # Don't poison the stage1 compiler (host -> host) unset AR AS CC CXX LD LDFLAGS NM OBJCOPY OBJDUMP RANLIB READELF RUSTFLAGS STRIP -# modify config.toml to correct path, only do this once as it trigger full rebuild -if [ ! -f config.toml ]; then - cat ${COOKBOOK_RECIPE}/config.toml > config.toml - sed -i "s|COOKBOOK_SYSROOT|${COOKBOOK_SYSROOT}|g" config.toml - sed -i "s|COOKBOOK_TOOLCHAIN|${COOKBOOK_TOOLCHAIN}|g" config.toml -fi +cat ${COOKBOOK_RECIPE}/config.toml > config.toml +sed -i "s|COOKBOOK_SYSROOT|${COOKBOOK_SYSROOT}|g" config.toml +sed -i "s|COOKBOOK_TOOLCHAIN|${COOKBOOK_TOOLCHAIN}|g" config.toml python3 "${COOKBOOK_SOURCE}/x.py" install \ --config config.toml \ @@ -54,12 +51,6 @@ mkdir -p "${COOKBOOK_STAGE}"/usr rsync -av --delete "${COOKBOOK_BUILD}"/install/* "${COOKBOOK_STAGE}"/usr/ rm -rf "${COOKBOOK_STAGE}"/usr/lib/rustlib/*.log """ - -[package] -# TODO: Not implemented -# version_script = """ -# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" -# """ [[optional-packages]] name = "doc"