Skip to content

Fix cgo toolchain path error when on target platform. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DLLarson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix cgo toolchain path error when on target platform. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
099c65a
Fix cgo toolchain path error when on target platform.
Dec 7, 2016
1c57908
Update go_1.6.3.bb
DLLarson Dec 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion recipes-devtools/go/go.inc
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,15 @@ setup_go_arch() {
}

setup_cgo_gcc_wrapper() {
sdkpathnative=${7:-${SDKPATHNATIVE}}
bindir=${5:-${bindir_nativesdk}}

# Is there a bug in the cross-compiler support for CGO? Can't get it
# to work without this wrapper
for t in gcc g++ ; do
cat > ${WORKDIR}/${TARGET_PREFIX}${t} <<EOT
#!/bin/sh
exec ${TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
exec ${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}${t} ${TARGET_CC_ARCH} --sysroot=${STAGING_DIR_TARGET} "\$@"
EOT
chmod +x ${WORKDIR}/${TARGET_PREFIX}${t}
done
Expand Down
9 changes: 7 additions & 2 deletions recipes-devtools/go/go_1.6.3.bb
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require go_${PV}.inc

PR = "r5"

PN_class-native = "go-native"
PN_class-cross = "go-cross"

Expand All @@ -18,11 +20,13 @@ do_compile() {

setup_cgo_gcc_wrapper

## Add WORKDIR to path.
export PATH="${WORKDIR}/:$PATH"
## TODO: consider setting GO_EXTLINK_ENABLED
export CGO_ENABLED="${GO_CROSS_CGO_ENABLED}"
export CC=${BUILD_CC}
export CC_FOR_TARGET="${WORKDIR}/${TARGET_PREFIX}gcc"
export CXX_FOR_TARGET="${WORKDIR}/${TARGET_PREFIX}g++"
export CC_FOR_TARGET="${TARGET_PREFIX}gcc"
export CXX_FOR_TARGET="${TARGET_PREFIX}g++"
export GO_GCFLAGS="${HOST_CFLAGS}"
export GO_LDFLAGS="${HOST_LDFLAGS}"

Expand All @@ -34,6 +38,7 @@ do_compile() {
}

go_install() {

install -d "${D}${bindir}" "${D}${GOROOT_FINAL}"
tar -C "${WORKDIR}/go-${PV}/go" -cf - bin lib src pkg test |
tar -C "${D}${GOROOT_FINAL}" -xf -
Expand Down