aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-23 00:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1225 from teawater/fixmakeinstall

Browse Source 
Makefile: Set ARCH in GOPATH not set mode
This commit is contained in:
Peng Tao
2019-02-12 09:14:54 +08:00
committed by GitHub
parent 6431f1f288 81c7a968ed
commit 1c27ab79d9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -23,9 +23,17 @@ ifeq ($(SKIP_GO_VERSION_CHECK),)
include golang.mk
endif
GOARCH=$(shell go env GOARCH)
ifeq ($(ARCH),)
ARCH = $(GOARCH)
#Get ARCH.
ifneq ($(GOPATH),)
GOARCH=$(shell go env GOARCH)
ifeq ($(ARCH),)
ARCH = $(GOARCH)
endif
else
ARCH = $(shell uname -m)
ifeq ($(ARCH),x86_64)
ARCH = amd64
endif
endif
ARCH_DIR = arch