From 50c9d3d2cee72eef4126eb2e900f049d1af027a6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 11 May 2024 15:42:00 -0600 Subject: [PATCH] Use separate copy of relibc for freestanding --- mk/prefix.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 93906b5..dd57d9b 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -26,6 +26,7 @@ $(PREFIX)/relibc: $(ROOT)/relibc mkdir -p "$(@D)" rm -rf "$@.partial" "$@" cp -r "$^" "$@.partial" + touch "$@.partial" mv "$@.partial" "$@" $(PREFIX)/relibc-install: $(PREFIX)/relibc | $(PREFIX)/rust-install $(CONTAINER_TAG) @@ -185,7 +186,15 @@ else mv "$@.partial" "$@" endif -$(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG) +$(PREFIX)/relibc-freestanding: $(ROOT)/relibc + mkdir -p "$(@D)" + rm -rf "$@.partial" "$@" + cp -r "$^" "$@.partial" + touch "$@.partial" + mv "$@.partial" "$@" + + +$(PREFIX)/relibc-freestanding-install: $(PREFIX)/relibc-freestanding | $(PREFIX_BASE_INSTALL) $(PREFIX_FREESTANDING_INSTALL) $(CONTAINER_TAG) ifeq ($(PODMAN_BUILD),1) $(PODMAN_RUN) $(MAKE) $@ else