github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-01 17:52:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1168 from bryteise/hypervisor-cmd-defaults

Browse Source 
Makefile: Provide default hypervisor CMD settings
This commit is contained in:
James O. D. Hunt 2019-01-30 11:36:32 +00:00 committed by GitHub
commit 91c454da09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -23,22 +23,20 @@ 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)
endif
ARCH_DIR = arch
ARCH_FILE_SUFFIX = -options.mk
ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX)
ARCH_FILES = $(wildcard arch/*$(ARCH_FILE_SUFFIX))
ALL_ARCHES = $(patsubst $(ARCH_DIR)/%$(ARCH_FILE_SUFFIX),%,$(ARCH_FILES))
# Load architecture-dependent settings
include $(ARCH_FILE)
endif endif
ARCH_DIR = arch
ARCH_FILE_SUFFIX = -options.mk
ARCH_FILE = $(ARCH_DIR)/$(ARCH)$(ARCH_FILE_SUFFIX)
ARCH_FILES = $(wildcard arch/*$(ARCH_FILE_SUFFIX))
ALL_ARCHES = $(patsubst $(ARCH_DIR)/%$(ARCH_FILE_SUFFIX),%,$(ARCH_FILES))
# Load architecture-dependent settings
include $(ARCH_FILE)
PROJECT_TYPE = kata PROJECT_TYPE = kata
PROJECT_NAME = Kata Containers PROJECT_NAME = Kata Containers
PROJECT_TAG = kata-containers PROJECT_TAG = kata-containers