mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-11-05 04:06:38 +08:00
Merge branch 'makefile-fix' into 'master'
Fix Makefile See merge request redox-os/redox!1708
This commit is contained in:
commit
7e46f5747b
4
Makefile
4
Makefile
@ -37,7 +37,7 @@ ifeq ($(PODMAN_BUILD),1)
|
|||||||
ifneq ("$(wildcard $(CONTAINER_TAG))","")
|
ifneq ("$(wildcard $(CONTAINER_TAG))","")
|
||||||
$(PODMAN_RUN) make $@
|
$(PODMAN_RUN) make $@
|
||||||
else
|
else
|
||||||
$(info will not run cookbook clean as container is not built)
|
$(info will not run cookbook clean as container is not built)
|
||||||
$(MAKE) clean PODMAN_BUILD=0 NOT_ON_PODMAN=1 SKIP_CHECK_TOOLS=1
|
$(MAKE) clean PODMAN_BUILD=0 NOT_ON_PODMAN=1 SKIP_CHECK_TOOLS=1
|
||||||
endif # CONTAINER_TAG
|
endif # CONTAINER_TAG
|
||||||
else
|
else
|
||||||
@ -56,7 +56,7 @@ ifeq ($(PODMAN_BUILD),1)
|
|||||||
ifneq ("$(wildcard $(CONTAINER_TAG))","")
|
ifneq ("$(wildcard $(CONTAINER_TAG))","")
|
||||||
$(PODMAN_RUN) make $@
|
$(PODMAN_RUN) make $@
|
||||||
else
|
else
|
||||||
$(info will not run cookbook unfetch as container is not built)
|
$(info will not run cookbook unfetch as container is not built)
|
||||||
$(MAKE) distclean PODMAN_BUILD=0 NOT_ON_PODMAN=1 SKIP_CHECK_TOOLS=1
|
$(MAKE) distclean PODMAN_BUILD=0 NOT_ON_PODMAN=1 SKIP_CHECK_TOOLS=1
|
||||||
endif # CONTAINER_TAG
|
endif # CONTAINER_TAG
|
||||||
else
|
else
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user