diff --git a/mk/config.mk b/mk/config.mk index e40e096..5e0bfc8 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -22,8 +22,9 @@ FILESYSTEM_CONFIG?=config/$(ARCH)/$(CONFIG_NAME).toml else FILESYSTEM_CONFIG?=config/$(ARCH)/$(BOARD)/$(CONFIG_NAME).toml endif +HOST_CARGO=env -u RUSTUP_TOOLCHAIN -u CC -u TARGET cargo ## Filesystem size in MB (default comes from filesystem_size in the FILESYSTEM_CONFIG) -FILESYSTEM_SIZE?=$(shell cargo run --release --manifest-path installer/Cargo.toml -- --filesystem-size -c $(FILESYSTEM_CONFIG)) +FILESYSTEM_SIZE?=$(shell $(HOST_CARGO) run --release --manifest-path installer/Cargo.toml -- --filesystem-size -c $(FILESYSTEM_CONFIG)) ## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption REDOXFS_MKFS_FLAGS?= ## Set to 1 to enable Podman build, any other value will disable it @@ -32,7 +33,6 @@ PODMAN_BUILD?=0 CONTAINERFILE?=podman/redox-base-containerfile # Per host variables -HOST_CARGO=env -u RUSTUP_TOOLCHAIN cargo export NPROC=nproc export REDOX_MAKE=make HOST_TARGET := $(shell env -u RUSTUP_TOOLCHAIN rustc -vV | grep host | cut -d: -f2 | tr -d " ")