diff options
author | Jose Quaresma <quaresma.jose@gmail.com> | 2024-04-19 18:53:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-22 22:05:58 +0100 |
commit | c9d4417499ee3832fec841c62c3630be0582d28b (patch) | |
tree | d254a04de6e11641042b2a89e28013502988e098 | |
parent | f8125af8e794a7a938b452010aac8e0a379f247f (diff) | |
download | poky-c9d4417499ee3832fec841c62c3630be0582d28b.tar.gz |
go: Drop the linkmode completely
This will make possible to restore the default dynamic linking globally
which is what we had before the 1.20.X release.
(From OE-Core rev: 48c0df42fbb9b6bf41eb70aaa13baee4127e2074)
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/go.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index cc3564c36a..d32509aa6d 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass | |||
@@ -48,8 +48,6 @@ GO_RPATH:class-native = "${@'-r ${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE | |||
48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" | 48 | GO_RPATH_LINK:class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" |
49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" | 49 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" |
50 | GO_LINKMODE ?= "" | 50 | GO_LINKMODE ?= "" |
51 | GO_LINKMODE:class-nativesdk = "--linkmode=external" | ||
52 | GO_LINKMODE:class-native = "--linkmode=external" | ||
53 | GO_EXTRA_LDFLAGS ?= "" | 51 | GO_EXTRA_LDFLAGS ?= "" |
54 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" | 52 | GO_LINUXLOADER ?= "-I ${@get_linuxloader(d)}" |
55 | # Use system loader. If uninative is used, the uninative loader will be patched automatically | 53 | # Use system loader. If uninative is used, the uninative loader will be patched automatically |
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 3f1e795dd9..413cf6d33f 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc | |||
@@ -15,7 +15,7 @@ export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-pr | |||
15 | export GOCACHE = "${B}/.cache" | 15 | export GOCACHE = "${B}/.cache" |
16 | 16 | ||
17 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" | 17 | GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${LDFLAGS}" |
18 | GO_SHLIB_LDFLAGS ?= '-ldflags="--linkmode=external -extldflags '${GO_EXTLDFLAGS}'"' | 18 | GO_SHLIB_LDFLAGS ?= '-ldflags="-extldflags '${GO_EXTLDFLAGS}'"' |
19 | 19 | ||
20 | do_configure() { | 20 | do_configure() { |
21 | : | 21 | : |