From 3374d5a95e684856eea4f00210ee6693723f861d Mon Sep 17 00:00:00 2001 From: Konstantin Shabanov Date: Fri, 7 Aug 2026 23:23:44 +0700 Subject: [PATCH] mk: Explicitly set SKIP_CHECK_TOOLS Rather than checking for different env variables, explicitly set SKIP_CHECK_TOOLS for podman build and hosted redox. --- mk/config.mk | 4 ++++ mk/depends.mk | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index 2267e5090..9e799e6f4 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -125,6 +125,8 @@ else ifeq ($(UNAME),Redox) export CARGO_NET_GIT_FETCH_WITH_CLI=true # TODO: allow overriding to cross compiler toolchain when build server have one prebuilt HOSTED_REDOX=1 +# Don't check for dependencies if you will be using Hosted Redox + SKIP_CHECK_TOOLS=1 ifneq ($(shell which repo),) REPO_BIN=repo endif @@ -146,6 +148,8 @@ export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt export TESTBIN?= RUNNING_IN_PODMAN=$(shell [ -f /run/.containerenv ] && echo 1 || echo 0) ifeq ($(PODMAN_BUILD),1) +# Don't check for dependencies if you will be using Podman +SKIP_CHECK_TOOLS=1 ifeq ($(RUNNING_IN_PODMAN),1) $(info Please unset PODMAN_BUILD=1 in .config!) endif diff --git a/mk/depends.mk b/mk/depends.mk index e3643316f..d46a9542f 100644 --- a/mk/depends.mk +++ b/mk/depends.mk @@ -1,10 +1,5 @@ # Configuration file for the build system dependencies -# Don't check for dependencies if you will be using Podman -ifneq ($(PODMAN_BUILD),1) -# Don't check for dependencies if you will be using Hosted Redox -ifneq ($(HOSTED_REDOX),1) - # don't check for compile tools, used when tools are managed externally, like in nix or CI ifneq ($(SKIP_CHECK_TOOLS),1) ifeq ($(shell which rustup),) @@ -20,6 +15,3 @@ ifeq ($(shell which just),) $(error 'just' not found, install from crates.io or from your package manager) endif endif - -endif -endif