From 065bb6677ef898924d129b560844b764787076be Mon Sep 17 00:00:00 2001 From: Haichao Li Date: Mon, 6 Jan 2020 11:35:48 +0800 Subject: [PATCH] Dep: Update golang dep to support Arm64 Current Rook code uses go dep 0.5.0 and separates handling for Arm and x86. It's because there's no dep 0.5.0 binary for arm64.Dep has updated to 0.5.4 and supports arm64. Rook code can be simplified by upgrading dep to fix gaps of Arm and x86. Change-Id: Id91a993ca059461faa8a83065c93dadc7cdffeb2 Signed-off-by: Haichao Li --- build/makelib/golang.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build/makelib/golang.mk b/build/makelib/golang.mk index e9854ff8e..d3a4cfe80 100644 --- a/build/makelib/golang.mk +++ b/build/makelib/golang.mk @@ -65,7 +65,7 @@ endif GOPATH := $(shell go env GOPATH) # setup tools used during the build -DEP_VERSION=v0.5.0 +DEP_VERSION=v0.5.4 DEP := $(TOOLS_HOST_DIR)/dep-$(DEP_VERSION) GOLINT := $(TOOLS_HOST_DIR)/golint GOJUNIT := $(TOOLS_HOST_DIR)/go-junit-report @@ -195,12 +195,7 @@ go.vendor.update: $(DEP) $(DEP): @echo === installing dep @mkdir -p $(TOOLS_HOST_DIR)/tmp - @if [ "$(GOHOSTARCH)" = "arm64" ]; then\ - GOPATH=$(TOOLS_HOST_DIR)/tmp GOBIN=$(TOOLS_HOST_DIR) $(GOHOST) get -u github.com/golang/dep/cmd/dep;\ - mv $(TOOLS_HOST_DIR)/dep $@;\ - else \ - curl -sL -o $(DEP) https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-$(GOHOSTOS)-$(GOHOSTARCH);\ - fi + @curl -sL -o $(DEP) https://github.com/golang/dep/releases/download/$(DEP_VERSION)/dep-$(GOHOSTOS)-$(GOHOSTARCH) @chmod +x $(DEP) @rm -fr $(TOOLS_HOST_DIR)/tmp