From 42e6d691fa72e92128845264d0bdab8505335fbf Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Fri, 26 Jul 2019 14:04:00 -0700
Subject: [PATCH] Fix multi-platform build in Makefile

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ab6030a..49b15c0 100644
--- a/Makefile
+++ b/Makefile
@@ -147,12 +147,13 @@ push-name:
 	@echo "pushed: $(IMAGE):$(TAG)"
 
 # This depends on github.com/estesp/manifest-tool in $PATH.
-manifest-list: push
-	manifest-tool \
-	    --username=oauth2accesstoken \
-	    --password=$$(gcloud auth print-access-token) \
-	    push from-args \
-	    --platforms "$(ALL_PLATFORMS)" \
+manifest-list: all-push
+	platforms=$$(echo $(ALL_PLATFORMS) | sed 's/ /,/g');  \
+	manifest-tool                                         \
+	    --username=oauth2accesstoken                      \
+	    --password=$$(gcloud auth print-access-token)     \
+	    push from-args                                    \
+	    --platforms "$$platforms"                         \
 	    --template $(REGISTRY)/$(BIN):$(VERSION)__OS_ARCH \
 	    --target $(REGISTRY)/$(BIN):$(VERSION)