diff options
Diffstat (limited to 'meta/recipes-devtools/go')
-rw-r--r-- | meta/recipes-devtools/go/go-cross-canadian.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc index 8298fe31be..dd485b6799 100644 --- a/meta/recipes-devtools/go/go-cross-canadian.inc +++ b/meta/recipes-devtools/go/go-cross-canadian.inc | |||
@@ -16,7 +16,7 @@ DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR} \ | |||
16 | export GOTOOLDIR_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/${HOST_SYS}/go/pkg/tool/${BUILD_GOTUPLE}" | 16 | export GOTOOLDIR_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/${HOST_SYS}/go/pkg/tool/${BUILD_GOTUPLE}" |
17 | export CGO_CFLAGS = "${CFLAGS}" | 17 | export CGO_CFLAGS = "${CFLAGS}" |
18 | export CGO_LDFLAGS = "${LDFLAGS}" | 18 | export CGO_LDFLAGS = "${LDFLAGS}" |
19 | export GO_LDFLAGS = '-linkmode external -extld ${HOST_PREFIX}gcc -extldflags "--sysroot=${STAGING_DIR_HOST} ${SECURITY_NOPIE_CFLAGS} ${HOST_CC_ARCH} ${LDFLAGS}"' | 19 | export GO_LDFLAGS = '-extld ${HOST_PREFIX}gcc -extldflags "--sysroot=${STAGING_DIR_HOST} ${SECURITY_NOPIE_CFLAGS} ${HOST_CC_ARCH} ${LDFLAGS}"' |
20 | 20 | ||
21 | do_configure[noexec] = "1" | 21 | do_configure[noexec] = "1" |
22 | 22 | ||
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index a4b55ad3d8..981c7abd31 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc | |||
@@ -13,9 +13,7 @@ export CGO_CXXFLAGS = "${CXXFLAGS}" | |||
13 | export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-prefix-map'), d.getVar('LDFLAGS').split())) }" | 13 | export CGO_LDFLAGS = "${@ ' '.join(filter(lambda f: not f.startswith('-fdebug-prefix-map'), d.getVar('LDFLAGS').split())) }" |
14 | 14 | ||
15 | export GOCACHE = "${B}/.cache" | 15 | export GOCACHE = "${B}/.cache" |
16 | GO_LDFLAGS = "" | 16 | export GO_LDFLAGS = "" |
17 | GO_LDFLAGS:class-nativesdk = " -linkmode external" | ||
18 | export GO_LDFLAGS | ||
19 | export GOBUILDFLAGS = "-gcflags=-trimpath=$GOPATH -asmflags=-trimpath=$GOPATH -trimpath" | 17 | export GOBUILDFLAGS = "-gcflags=-trimpath=$GOPATH -asmflags=-trimpath=$GOPATH -trimpath" |
20 | CC:append:class-nativesdk = " ${SECURITY_NOPIE_CFLAGS}" | 18 | CC:append:class-nativesdk = " ${SECURITY_NOPIE_CFLAGS}" |
21 | 19 | ||