summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/go
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2017-09-14 16:22:27 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-21 09:05:50 +0100
commit82ba908d86a75401c86b966d1579a9e5e00ff05d (patch)
treedcca79eb74c1e74b093156e75bab4b79c840717f /meta/recipes-devtools/go
parent8daf994f11086026e4543a4d42da091e0dec553c (diff)
downloadpoky-82ba908d86a75401c86b966d1579a9e5e00ff05d.tar.gz
go-crosssdk: fix host/target references and cleanup
* The _FOR_TARGET variables need to include SDKNATIVEPATH * Install tools (cmd) only, and for the build host * Remove unnecessary FILES setting Corrects some errors when the build host architecture is different from the SDKMACHINE's. (From OE-Core rev: 94cfa563388fb39e6a409eefcae1598a9d426a5c) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/go')
-rw-r--r--meta/recipes-devtools/go/go-crosssdk.inc11
1 files changed, 5 insertions, 6 deletions
diff --git a/meta/recipes-devtools/go/go-crosssdk.inc b/meta/recipes-devtools/go/go-crosssdk.inc
index e9bc677131..471c75b3d5 100644
--- a/meta/recipes-devtools/go/go-crosssdk.inc
+++ b/meta/recipes-devtools/go/go-crosssdk.inc
@@ -11,8 +11,9 @@ export GOARCH = "${TARGET_GOARCH}"
11export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" 11export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go"
12export GOROOT_FINAL = "${libdir}/go" 12export GOROOT_FINAL = "${libdir}/go"
13export CGO_ENABLED = "1" 13export CGO_ENABLED = "1"
14export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" 14export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}"
15export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" 15export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}"
16export GO_INSTALL = "cmd"
16CC = "${@d.getVar('BUILD_CC', True).strip()}" 17CC = "${@d.getVar('BUILD_CC', True).strip()}"
17 18
18do_configure[noexec] = "1" 19do_configure[noexec] = "1"
@@ -43,13 +44,11 @@ do_install() {
43 install -d ${D}${libdir}/go/bin 44 install -d ${D}${libdir}/go/bin
44 install -d ${D}${libdir}/go/pkg/tool 45 install -d ${D}${libdir}/go/pkg/tool
45 install -d ${D}${bindir} 46 install -d ${D}${bindir}
46 cp --preserve=mode,timestamps -R ${S}/pkg/tool/${TARGET_GOTUPLE} ${D}${libdir}/go/pkg/tool/ 47 cp --preserve=mode,timestamps -R ${S}/pkg/tool/${BUILD_GOTUPLE} ${D}${libdir}/go/pkg/tool/
47 for f in ${B}/${GO_BUILD_BINDIR}/* 48 for f in ${B}/bin/*
48 do 49 do
49 base=`basename $f` 50 base=`basename $f`
50 install -m755 $f ${D}${libdir}/go/bin 51 install -m755 $f ${D}${libdir}/go/bin
51 make_wrapper $base ${TARGET_PREFIX}$base 52 make_wrapper $base ${TARGET_PREFIX}$base
52 done 53 done
53} 54}
54
55FILES_${PN}-staticdev = "${libdir}/go/pkg"