diff options
| author |   Matt Madison <matt@madison.systems> | 2017-09-14 16:22:28 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 09:03:33 +0100 |
| commit | f76779f7ef6636355a5aa5741a736f5234a67fdb (patch) | |
| tree | 50b5ccec815bb3116089825c87cfce74ae8b5740 | |
| parent | 94cfa563388fb39e6a409eefcae1598a9d426a5c (diff) | |
| download | openembedded-core-contrib-f76779f7ef6636355a5aa5741a736f5234a67fdb.tar.gz | |
go: fix linking issues for nativesdk builds
Switch to using an external linker for nativesdk
go, go-runtime, and go package builds, which works
more reliably when building 32-bit SDKs.
Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/go.bbclass | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 33502bf722c..863b578e5c0 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -37,7 +37,9 @@ GO_RPATH = "${@'-r ${libdir}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_D GO_RPATH_class-native = "${@'-r ${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" GO_RPATH_LINK_class-native = "${@'-Wl,-rpath-link=${STAGING_LIBDIR_NATIVE}/go/pkg/${TARGET_GOTUPLE}_dynlink' if d.getVar('GO_DYNLINK') else ''}" GO_EXTLDFLAGS ?= "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS} ${GO_RPATH_LINK} ${LDFLAGS}" -GO_LDFLAGS ?= '-ldflags="${GO_RPATH} -extldflags '${GO_EXTLDFLAGS}'"' +GO_LINKMODE ?= "" +GO_LINKMODE_class-nativesdk = "--linkmode=external" +GO_LDFLAGS ?= '-ldflags="${GO_RPATH} ${GO_LINKMODE} -extldflags '${GO_EXTLDFLAGS}'"' export GOBUILDFLAGS ?= "-v ${GO_LDFLAGS}" export GOPTESTBUILDFLAGS ?= "${GOBUILDFLAGS} -c" export GOPTESTFLAGS ?= "-test.v" diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index a074238e474..934d1aaeb93 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -45,6 +45,11 @@ do_install() { done } +# Remove test binaries that cannot be relocated +do_install_append_class-nativesdk() { + rm -rf ${D}${libdir}/go/src/runtime/pprof/testdata +} + # These testdata directories aren't needed for builds and contain binaries # that can cause errors in sysroot_strip(), so just remove them. sysroot_stage_all_append() { diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index 0d80bf0d97f..b88d0166e5b 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc @@ -14,6 +14,9 @@ export CC_FOR_TARGET = "${CC}" export CXX_FOR_TARGET = "${CXX}" export GO_TARGET_INSTALL = "cmd" export GO_FLAGS = "-a" +GO_LDFLAGS = "" +GO_LDFLAGS_class-nativesdk = "-linkmode external" +export GO_LDFLAGS do_configure[noexec] = "1" |