github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-17 15:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Makefile: Set arch regardless of GOPATH state

Browse Source 
Architecture-dependent settings were not being populated when GOPATH
was set. This change ensures they are always set.

Fixes #1169

Signed-off-by: William Douglas <william.douglas@intel.com>
This commit is contained in:
William Douglas 2019-01-24 09:20:21 -08:00
parent 6f2c036601
commit a02c39efd0
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,6 @@ ifeq ($(SKIP_GO_VERSION_CHECK),)
include golang.mk include golang.mk
endif endif
ifneq ($(GOPATH),)
GOARCH=$(shell go env GOARCH) GOARCH=$(shell go env GOARCH)
ifeq ($(ARCH),) ifeq ($(ARCH),)
ARCH = $(GOARCH) ARCH = $(GOARCH)
@ -37,7 +36,6 @@ ifneq ($(GOPATH),)
# Load architecture-dependent settings # Load architecture-dependent settings
include $(ARCH_FILE) include $(ARCH_FILE)
endif
PROJECT_TYPE = kata PROJECT_TYPE = kata
PROJECT_NAME = Kata Containers PROJECT_NAME = Kata Containers