diff options
| author |   Matt Madison <matt@madison.systems> | 2017-09-14 16:22:27 -0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 09:03:33 +0100 |
| commit | 94cfa563388fb39e6a409eefcae1598a9d426a5c (patch) | |
| tree | c0dc934ea6c57fc636416f4a666609cd4c2eeb01 | |
| parent | f967351694709a93ba6d1553e5b400a8cb5c8589 (diff) | |
| download | openembedded-core-contrib-94cfa563388fb39e6a409eefcae1598a9d426a5c.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.
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/recipes-devtools/go/go-crosssdk.inc | 11 |
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}" export GOROOT_BOOTSTRAP = "${STAGING_LIBDIR_NATIVE}/go" export GOROOT_FINAL = "${libdir}/go" export CGO_ENABLED = "1" -export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" -export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}" +export CC_FOR_TARGET="${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" +export CXX_FOR_TARGET="${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET}${SDKPATHNATIVE}" +export GO_INSTALL = "cmd" CC = "${@d.getVar('BUILD_CC', True).strip()}" do_configure[noexec] = "1" @@ -43,13 +44,11 @@ do_install() { install -d ${D}${libdir}/go/bin install -d ${D}${libdir}/go/pkg/tool install -d ${D}${bindir} - cp --preserve=mode,timestamps -R ${S}/pkg/tool/${TARGET_GOTUPLE} ${D}${libdir}/go/pkg/tool/ - for f in ${B}/${GO_BUILD_BINDIR}/* + cp --preserve=mode,timestamps -R ${S}/pkg/tool/${BUILD_GOTUPLE} ${D}${libdir}/go/pkg/tool/ + for f in ${B}/bin/* do base=`basename $f` install -m755 $f ${D}${libdir}/go/bin make_wrapper $base ${TARGET_PREFIX}$base done } - -FILES_${PN}-staticdev = "${libdir}/go/pkg" |