summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2025-03-01 15:55:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-03 18:01:29 +0000
commit9729465f1d1affe272bf55963852e189bd36cf2e (patch)
tree4a2782dc6aa88f1b431f76d72810899b96235f7f
parentef1d0dea7bb330f1169e16e387df4a3ae30a4529 (diff)
downloadpoky-9729465f1d1affe272bf55963852e189bd36cf2e.tar.gz
go: remove support for GOROOT_FINAL
After upstream go applied commit [cmd: remove support for GOROOT_FINAL][1], GOROOT_FINAL variable is dropped and use option -trimpath to instead [2] The option -trimpath has already been added to GOBUILDFLAGS in go.bbclass [1] https://github.com/golang/go/commit/507d1b22f4b58ac68841582d0c2c0ab6b20e5a98 [2] https://github.com/golang/go/issues/62047 (From OE-Core rev: 791ab77ac05f658ecd61525a3d9b1afaf8ac6e06) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/go.bbclass1
-rw-r--r--meta/recipes-devtools/go/go-common.inc1
2 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass
index e3e4782025..c81d946069 100644
--- a/meta/classes-recipe/go.bbclass
+++ b/meta/classes-recipe/go.bbclass
@@ -15,7 +15,6 @@ GOROOT:class-native = "${STAGING_LIBDIR_NATIVE}/go"
15GOROOT:class-nativesdk = "${STAGING_DIR_TARGET}${libdir}/go" 15GOROOT:class-nativesdk = "${STAGING_DIR_TARGET}${libdir}/go"
16GOROOT = "${STAGING_LIBDIR}/go" 16GOROOT = "${STAGING_LIBDIR}/go"
17export GOROOT 17export GOROOT
18export GOROOT_FINAL = "${libdir}/go"
19export GOCACHE = "${B}/.cache" 18export GOCACHE = "${B}/.cache"
20 19
21export GOARCH = "${TARGET_GOARCH}" 20export GOARCH = "${TARGET_GOARCH}"
diff --git a/meta/recipes-devtools/go/go-common.inc b/meta/recipes-devtools/go/go-common.inc
index db165792dc..ca8469dbd9 100644
--- a/meta/recipes-devtools/go/go-common.inc
+++ b/meta/recipes-devtools/go/go-common.inc
@@ -38,7 +38,6 @@ export GOARCH ?= "${TARGET_GOARCH}"
38export GOARM ?= "${TARGET_GOARM}" 38export GOARM ?= "${TARGET_GOARM}"
39export GO386 ?= "${TARGET_GO386}" 39export GO386 ?= "${TARGET_GO386}"
40export GOMIPS ?= "${TARGET_GOMIPS}" 40export GOMIPS ?= "${TARGET_GOMIPS}"
41export GOROOT_FINAL ?= "${libdir}/go"
42 41
43export GODEBUG = "gocachehash=1" 42export GODEBUG = "gocachehash=1"
44 43