diff --git a/mk/config.mk b/mk/config.mk index aabf1ace..8ea2d98f 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -115,11 +115,12 @@ else ifeq ($(UNAME),FreeBSD) FIND=gfind FUMOUNT=sudo umount VB_AUDIO=pulse # To check, will probably be OSS on most setups - VBM=VBoxManage' + VBM=VBoxManage else ifeq ($(UNAME),Redox) PODMAN_BUILD=0 +# TODO: allow overriding to cross compiler toolchain when build server have one prebuilt HOSTED_REDOX=1 -ifeq ($(shell which rustc),) +ifneq ($(shell which repo),) REPO_BIN=repo endif else diff --git a/mk/depends.mk b/mk/depends.mk index 06fcc4c1..4d698c84 100644 --- a/mk/depends.mk +++ b/mk/depends.mk @@ -1,8 +1,8 @@ # Configuration file for the build system dependencies -# Don't check for depends if you will be using Podman +# Don't check for dependencies if you will be using Podman ifneq ($(PODMAN_BUILD),1) -# Don't check for depends if you will be using Hosted Redox +# Don't check for dependencies if you will be using Hosted Redox ifneq ($(HOSTED_REDOX),1) # don't check for Rust and Cargo if building on a Nix system