Skip to content

Commit 4dda181

Browse files
committed
SWPROT-8953: build: Update cargo to match unify v7 ci
This was useful for building image-provider outside unify. Unsure which version was the reference in UnifySDK-1.6, there was no reason to update if it worked for zpc. On this topic it would be developer friendly that the version of debian stable currently rustc=1.63 https://tracker.debian.org/pkg/rustc and also latest stable https://releases.rs/ currently Stable: 1.84.1 which might land in next debian-13 Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
1 parent e1d08fb commit 4dda181

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

helper.mk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ packages+=python3-jinja2
3737
packages+=yarnpkg
3838

3939
rust_url?=https://sh.rustup.rs
40-
RUST_VERSION?=1.65.0
40+
RUST_VERSION?=1.71.0
4141
export PATH := ${HOME}/.cargo/bin:${PATH}
4242

4343

@@ -62,6 +62,11 @@ else
6262
# CMAKE_SYSTEM_PROCESSOR?=$(shell uname -m)
6363
endif
6464

65+
ifdef CARGO_TARGET_TRIPLE
66+
cmake_options+=-DCARGO_TARGET_TRIPLE="${CARGO_TARGET_TRIPLE}"
67+
export CMAKE_TARGET_TRIPLE
68+
endif
69+
6570

6671
help: README.md
6772
@cat $<
@@ -88,11 +93,14 @@ setup/rust:
8893
-which rustc
8994
rustc --version
9095
cargo --version
96+
rustc --print target-list
97+
@echo "$@: TODO: https://github.com/kornelski/cargo-deb/issues/159"
98+
cargo install --version 1.44.0 --locked cargo-deb
9199
@echo "$@: TODO: Support stable version from https://releases.rs/ or older"
92100

93101
setup/python:
94102
python3 --version
95-
@echo "$@: TODO: https://github.com/wbond/pybars3/issues/82"
103+
@echo "$@: TODO: https://bugs.debian.org/1094297"
96104
pip3 --version || echo "warning: Please install pip"
97105
pip3 install "pybars3" \
98106
|| pip3 install --break-system-packages "pybars3"

0 commit comments

Comments
 (0)