diff options
-rw-r--r-- | meta/classes/go.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-common.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 7 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 10 |
4 files changed, 18 insertions, 3 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 5c1fdd7d5f..9c4c92bffd 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass | |||
@@ -67,7 +67,7 @@ GO_INSTALL_FILTEROUT ?= "${GO_IMPORT}/vendor/" | |||
67 | 67 | ||
68 | B = "${WORKDIR}/build" | 68 | B = "${WORKDIR}/build" |
69 | export GOPATH = "${B}" | 69 | export GOPATH = "${B}" |
70 | export GOTMPDIR ?= "${WORKDIR}/go-tmp" | 70 | export GOTMPDIR ?= "${WORKDIR}/build-tmp" |
71 | GOTMPDIR[vardepvalue] = "" | 71 | GOTMPDIR[vardepvalue] = "" |
72 | 72 | ||
73 | python go_do_unpack() { | 73 | python go_do_unpack() { |
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc index 5bbf35b787..83f8db7b39 100644 --- a/meta/recipes-devtools/go/go-common.inc +++ b/meta/recipes-devtools/go/go-common.inc | |||
@@ -23,7 +23,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | |||
23 | SSTATE_SCAN_CMD = "true" | 23 | SSTATE_SCAN_CMD = "true" |
24 | 24 | ||
25 | export GOROOT_OVERRIDE = "1" | 25 | export GOROOT_OVERRIDE = "1" |
26 | export GOTMPDIR ?= "${WORKDIR}/go-tmp" | 26 | export GOTMPDIR ?= "${WORKDIR}/build-tmp" |
27 | GOTMPDIR[vardepvalue] = "" | 27 | GOTMPDIR[vardepvalue] = "" |
28 | export CGO_ENABLED = "1" | 28 | export CGO_ENABLED = "1" |
29 | 29 | ||
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 617e6b5414..a08d44dd3a 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc | |||
@@ -2,10 +2,15 @@ DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" | |||
2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" | 2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" |
3 | PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" | 3 | PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" |
4 | 4 | ||
5 | DEBUG_PREFIX_MAP = "\ | ||
6 | -fdebug-prefix-map=${STAGING_DIR_HOST}= \ | ||
7 | -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ | ||
8 | " | ||
9 | |||
5 | export CGO_CFLAGS = "${CFLAGS}" | 10 | export CGO_CFLAGS = "${CFLAGS}" |
6 | export CGO_CPPFLAGS = "${CPPFLAGS}" | 11 | export CGO_CPPFLAGS = "${CPPFLAGS}" |
7 | export CGO_CXXFLAGS = "${CXXFLAGS}" | 12 | export CGO_CXXFLAGS = "${CXXFLAGS}" |
8 | export CGO_LDFLAGS = "${LDFLAGS}" | 13 | export CGO_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED} ${SECURITY_LDFLAGS}" |
9 | export GOCACHE = "${B}/.cache" | 14 | export GOCACHE = "${B}/.cache" |
10 | 15 | ||
11 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" | 16 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" |
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index 47b4411d54..51f1b79cc3 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc | |||
@@ -1,6 +1,16 @@ | |||
1 | DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" | 1 | DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" |
2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" | 2 | DEPENDS:class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" |
3 | 3 | ||
4 | DEBUG_PREFIX_MAP = "\ | ||
5 | -fdebug-prefix-map=${STAGING_DIR_HOST}= \ | ||
6 | -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ | ||
7 | " | ||
8 | |||
9 | export CGO_CFLAGS = "${CFLAGS}" | ||
10 | export CGO_CPPFLAGS = "${CPPFLAGS}" | ||
11 | export CGO_CXXFLAGS = "${CXXFLAGS}" | ||
12 | export CGO_LDFLAGS = "-Wl,-O1 ${TARGET_LINK_HASH_STYLE} ${ASNEEDED} ${SECURITY_LDFLAGS}" | ||
13 | |||
4 | export GOCACHE = "${B}/.cache" | 14 | export GOCACHE = "${B}/.cache" |
5 | GO_LDFLAGS = "" | 15 | GO_LDFLAGS = "" |
6 | GO_LDFLAGS:class-nativesdk = "-linkmode external" | 16 | GO_LDFLAGS:class-nativesdk = "-linkmode external" |