Set the ISO go target environment properly

kubernetes · Oct 2, 2020 · 3a2ffd8 · 3a2ffd8
1 parent 23d8a6b
commit 3a2ffd8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.mk b/deploy/iso/minikube-iso/package/cni-plugins/cni-plugins.mk
@@ -13,6 +13,7 @@ CNI_PLUGINS_LICENSE_FILES = LICENSE
 CNI_PLUGINS_DEPENDENCIES = host-go
 
 CNI_PLUGINS_MAKE_ENV = \
+	$(GO_TARGET_ENV) \
 	CGO_ENABLED=0 \
 	GO111MODULE=off
 

diff --git a/deploy/iso/minikube-iso/package/cni/cni.mk b/deploy/iso/minikube-iso/package/cni/cni.mk
@@ -14,6 +14,7 @@ CNI_DEPENDENCIES = host-go
 
 CNI_GOPATH = $(@D)/_output
 CNI_MAKE_ENV = \
+	$(GO_TARGET_ENV) \
 	CGO_ENABLED=0 \
 	GO111MODULE=off \
 	GOPATH="$(CNI_GOPATH)" \

diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
@@ -10,6 +10,7 @@ CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
 CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme
 CONTAINERD_BIN_GOPATH = $(@D)/_output
 CONTAINERD_BIN_ENV = \
+	$(GO_TARGET_ENV) \
 	CGO_ENABLED=1 \
 	GO111MODULE=off \
 	GOPATH="$(CONTAINERD_BIN_GOPATH)" \

diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
@@ -11,6 +11,7 @@ CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = host-go libgpgme
 CRIO_BIN_GOPATH = $(@D)/_output
 CRIO_BIN_ENV = \
+	$(GO_TARGET_ENV) \
 	CGO_ENABLED=1 \
 	GO111MODULE=off \
 	GOPATH="$(CRIO_BIN_GOPATH)" \

diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk
@@ -10,6 +10,7 @@ PODMAN_DEPENDENCIES = host-go
 
 PODMAN_GOPATH = $(@D)/_output
 PODMAN_BIN_ENV = \
+	$(GO_TARGET_ENV) \
 	CGO_ENABLED=1 \
 	GOPATH="$(PODMAN_GOPATH)" \
 	GOBIN="$(PODMAN_GOPATH)/bin" \

diff --git a/deploy/iso/minikube-iso/package/runc-master/runc-master.mk b/deploy/iso/minikube-iso/package/runc-master/runc-master.mk
@@ -14,7 +14,8 @@ RUNC_MASTER_LICENSE_FILES = LICENSE
 RUNC_MASTER_DEPENDENCIES = host-go
 
 RUNC_MASTER_GOPATH = $(@D)/_output
-RUNC_MASTER_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
+RUNC_MASTER_MAKE_ENV = \
+	$(GO_TARGET_ENV) \
 	CGO_ENABLED=1 \
 	GO111MODULE=off \
 	GOPATH="$(RUNC_MASTER_GOPATH)" \