github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2739 from justincormack/darwin-cond

Browse Source 
Fix darwin conditional in Kub Makefile
This commit is contained in:
Riyaz Faizullabhoy 2017-11-15 10:13:40 -08:00 committed by GitHub
commit 377679858e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
projects/kubernetes/Makefile
View File

@ -3,10 +3,11 @@ KUBE_NETWORK ?= weave
KUBE_NETWORK_WEAVE ?= v2.0.5 KUBE_NETWORK_WEAVE ?= v2.0.5
ifeq ($(shell uname -s),"Darwin") ifeq ($(shell uname -s),Darwin)
KUBE_FORMATS ?= iso-efi KUBE_FORMATS ?= iso-efi
endif else
KUBE_FORMATS ?= iso-bios KUBE_FORMATS ?= iso-bios
endif
KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS)) KUBE_FORMAT_ARGS := $(patsubst %,-format %,$(KUBE_FORMATS))