mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-07-10 05:28:43 +08:00
Fix config
This commit is contained in:
parent
4ac4593192
commit
a9e311c012
10
mk/config.mk
10
mk/config.mk
@ -32,7 +32,8 @@ REDOXFS_MKFS_FLAGS?=
|
|||||||
## Set to 1 to enable Podman build, any other value will disable it
|
## Set to 1 to enable Podman build, any other value will disable it
|
||||||
PODMAN_BUILD?=1
|
PODMAN_BUILD?=1
|
||||||
## Enable sccache to speed up cargo builds
|
## Enable sccache to speed up cargo builds
|
||||||
SSCACHE_BUILD?=1
|
## only do this by default if this is inside podman
|
||||||
|
SSCACHE_BUILD?=$(PODMAN_BUILD)
|
||||||
## The containerfile to use for the Podman base image
|
## The containerfile to use for the Podman base image
|
||||||
CONTAINERFILE?=podman/redox-base-containerfile
|
CONTAINERFILE?=podman/redox-base-containerfile
|
||||||
|
|
||||||
@ -43,19 +44,18 @@ export REDOX_MAKE=make
|
|||||||
ifneq ($(PODMAN_BUILD),1)
|
ifneq ($(PODMAN_BUILD),1)
|
||||||
HOST_TARGET := $(shell env -u RUSTUP_TOOLCHAIN rustc -vV | grep host | cut -d: -f2 | tr -d " ")
|
HOST_TARGET := $(shell env -u RUSTUP_TOOLCHAIN rustc -vV | grep host | cut -d: -f2 | tr -d " ")
|
||||||
ifneq ($(HOST_TARGET),x86_64-unknown-linux-gnu)
|
ifneq ($(HOST_TARGET),x86_64-unknown-linux-gnu)
|
||||||
$(info The binary prefix is only built for x86_64 Linux hosts)
|
$(info The binary prefix is only built for x86_64 Linux hosts)
|
||||||
PREFIX_BINARY=0
|
PREFIX_BINARY=0
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(SSCACHE_BUILD),1)
|
ifeq ($(SSCACHE_BUILD),1)
|
||||||
ifeq (,$(shell command -v sccache))
|
ifeq (,$(shell command -v sccache))
|
||||||
$(info sccache not found in PATH)
|
$(info sccache not found in PATH)
|
||||||
SSCACHE_BUILD=0
|
SSCACHE_BUILD=0
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
UNAME := $(shell uname)
|
UNAME := $(shell uname)
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
FUMOUNT=umount
|
FUMOUNT=umount
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user