fix TARGETPLATFORM

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

Makefile

@@ -95,7 +95,7 @@ debian-% raspbian-% ubuntu-%: checkout ## build deb packages for the specified d
 static: DOCKER_BUILD_PKGS:=static-linux cross-mac cross-win cross-arm
 static: checkout ## build static-compiled packages
 	for p in $(DOCKER_BUILD_PKGS); do \
-		$(MAKE) -C $@ VERSION=$(VERSION) GO_VERSION=$(GO_VERSION) TARGETPLATFORM=$(TARGETPLATFORM) CONTAINERD_VERSION=$(CONTAINERD_VERSION) RUNC_VERSION=$(RUNC_VERSION) $${p}; \
+		$(MAKE) -C $@ VERSION=$(VERSION) GO_VERSION=$(GO_VERSION) CONTAINERD_VERSION=$(CONTAINERD_VERSION) RUNC_VERSION=$(RUNC_VERSION) $${p}; \
 	done
 
 .PHONY: verify

static/Makefile

@@ -28,9 +28,10 @@ ifneq ($(strip $(RUNC_VERSION)),)
 DOCKER_BUILD_OPTS +=--build-arg=RUNC_VERSION=$(RUNC_VERSION)
 endif
 
-ifeq ($(strip $(TARGETPLATFORM)),)
-TARGETPLATFORM=local
-endif
+# doing this looks to be resetting the per-target variant (sigh)
+#ifeq ($(strip $(TARGETPLATFORM)),)
+#TARGETPLATFORM=local
+#endif
 
 .PHONY: help
 help: ## show make targets
@@ -166,7 +167,7 @@ static-engine:
 
 .PHONY: static-buildx-plugin
 static-buildx-plugin:
-	cd $(BUILDX_DIR) && docker buildx bake --set binaries.platform=$(TARGETPLATFORM) binaries && mv ./bin/buildx ./bin/docker-buildx$(EXT)
+	cd $(BUILDX_DIR) && docker buildx bake --set binaries.platform=$(TARGETPLATFORM) binaries && mv ./bin/buildx$(EXT) ./bin/docker-buildx$(EXT)
 
 .PHONY: static-compose-plugin
 static-compose-plugin: