NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/go: re-integrate GO_COMMON_ENV into HOST_GO_COMMON_ENV

Browse Source 
There is no point in having some common Go env variables defined in
pkg-golang.mk:GO_COMMON_ENV, and some in
package/go/go.mk:HOST_GO_COMMON_ENV. Let's move all of them to
package/go/go.mk:HOST_GO_COMMON_ENV.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2020-08-29 11:14:35 +02:00
parent 7a89fa07ee
commit 1a17e4ae99
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/go/go.mk
View File

@ -16,9 +16,14 @@ HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache
HOST_GO_ROOT = $(HOST_DIR)/lib/go
HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache
# We pass an empty GOBIN, otherwise "go install: cannot install
# cross-compiled binaries when GOBIN is set"
HOST_GO_COMMON_ENV = \
GO111MODULE=off \
GOROOT="$(HOST_GO_ROOT)"
GOROOT="$(HOST_GO_ROOT)" \
PATH=$(BR_PATH) \
GOBIN= \
CGO_ENABLED=$(HOST_GO_CGO_ENABLED)
ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y)

13
package/pkg-golang.mk
View File

@ -23,20 +23,11 @@
GO_BIN = $(HOST_DIR)/bin/go
# We pass an empty GOBIN, otherwise "go install: cannot install
# cross-compiled binaries when GOBIN is set"
GO_COMMON_ENV = \
PATH=$(BR_PATH) \
GOBIN= \
CGO_ENABLED=$(HOST_GO_CGO_ENABLED)
GO_TARGET_ENV = \
$(HOST_GO_TARGET_ENV) \
$(GO_COMMON_ENV)
$(HOST_GO_TARGET_ENV)
GO_HOST_ENV = \
$(HOST_GO_HOST_ENV) \
$(GO_COMMON_ENV)
$(HOST_GO_HOST_ENV)
################################################################################
# inner-golang-package -- defines how the configuration, compilation and