From 90b5c3f66f1a71197f478a817a82d7d5999db2c9 Mon Sep 17 00:00:00 2001
From: Henry Wang <Henry.Wang@arm.com>
Date: Fri, 29 May 2020 09:36:17 +0800
Subject: [PATCH] Add default GOOS in Makefile and move breaking change of
 CHANGELOG.md

Signed-off-by: Henry Wang <Henry.Wang@arm.com>
---
 CHANGELOG.md | 2 +-
 Makefile     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aae2b33932..5075840f606 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,11 @@ Changes by Version
 ### Backend Changes
 
 #### Breaking Changes
-* Add arm64 support for binaries and docker images. Rename the released binary name format to <Name>-<OS>-<ARCH>, tarball name format to jaeger-<Version>-<OS>-<ARCH> ([#2176](https://github.com/jaegertracing/jaeger/pull/2176), [@MrXinWang](https://github.com/MrXinWang))
 
 #### New Features
 
 #### Bug fixes, Minor Improvements
+* Add arm64 support for binaries and make architecture configurable in docker images. ([#2176](https://github.com/jaegertracing/jaeger/pull/2176), [@MrXinWang](https://github.com/MrXinWang))
 
 ### UI Changes
 
diff --git a/Makefile b/Makefile
index 710c286c38c..99c94d9885b 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ ifeq ($(UNAME), s390x)
 else
 	RACE=-race
 endif
+GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 GOBUILD=CGO_ENABLED=0 installsuffix=cgo go build -trimpath
 GOTEST=go test -v $(RACE)