MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'skip-check-tools' into 'master'

Browse Source 
mk: Explicitly set SKIP_CHECK_TOOLS

See merge request redox-os/redox!2304
This commit is contained in:
Jeremy Soller 2026-08-18 14:04:24 -06:00
commit 0d8444e06d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/config.mk
View File

@ -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

8
mk/depends.mk
View File

@ -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