From 12b205f69876bf09bb6dfe03adcdefad5d4ee9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 20 Nov 2023 09:28:06 +0100 Subject: [PATCH] Remove makefile targets entrypoint{,.gz} for non x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/containers/buildah/pull/5183 The target internal/mkcw/embed/entrypoint is only built on x86_64, but internal/mkcw/embed/entrypoint.gz is run on all arches. This causes build failures on anything non x86_64 as internal/mkcw/embed/entrypoint is not build. Signed-off-by: Dan Čermák --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 85b43c7b9e..0fda9ae6eb 100644 --- a/Makefile +++ b/Makefile @@ -73,17 +73,16 @@ bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz $(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah ifneq ($(shell as --version | grep x86_64),) +internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint + $(RM) $@ + gzip -k $^ + internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s $(AS) -o $(patsubst %.s,%.o,$^) $^ $(LD) -o $@ $(patsubst %.s,%.o,$^) strip $@ -else -.PHONY: internal/mkcw/embed/entrypoint endif -internal/mkcw/embed/entrypoint.gz: internal/mkcw/embed/entrypoint - $(RM) $@ - gzip -k $^ .PHONY: buildah buildah: bin/buildah