MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-25 22:34:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'remove-cargo-config' into 'master'

Browse Source 
Remove cargo-config from cargo install

See merge request redox-os/redox!1669
This commit is contained in:
Jeremy Soller 2025-11-02 06:44:22 -07:00
commit f3dc5017a0
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mk/depends.mk
View File

@ -24,11 +24,4 @@ ifeq ($(shell which just),)
$(error 'just' not found, install from crates.io or from your package manager)
endif
ifneq ($(NIX_SHELL_BUILD),1)
CARGO_CONFIG_VERSION=0.1.1
ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config v$(CARGO_CONFIG_VERSION):$$'),)
$(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config")
endif
endif
endif

1
native_bootstrap.sh
View File

@ -1116,7 +1116,6 @@ else
fi
fi
cargoInstall cargo-config 0.1.1
cargoInstall just 1.42.4
cargoInstall cbindgen 0.29.0

1
podman/rustinstall.sh
View File

@ -9,4 +9,3 @@ curl -sSLf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/inst
cargo +stable binstall --no-confirm --force --version 0.10.0 sccache
cargo +stable binstall --no-confirm --force --version 1.42.4 just
cargo +stable binstall --no-confirm --force --version 0.29.0 cbindgen
cargo +stable install --force --version 0.1.1 cargo-config # TODO: Remove