| Message ID | 20250812205050.13599-1-osama.abdelkader@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] go-cross-canadian: fix binaries install and GOARCH | expand |
Thanks, lgtm. Alex On Tue, 12 Aug 2025 at 22:52, Osama Abdelkader <osama.abdelkader@gmail.com> wrote: > > set GOARCH to HOST_GOARCH which is set from SDKMACHINE, > since GOARCH defaults to TARGET_GOARCH, which is set from MACHINE (wrong arch). > > Also fix do_install to correctly install all binaries from > ${GO_BUILD_BINDIR} by using 'find -type f' to avoid issues when the > directory contains subdirectories (e.g. "linux_arm"). > > Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com> > --- > v2: > - Fixed commit message > --- > meta/recipes-devtools/go/go-cross-canadian.inc | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc > index 39330fc98b..4a6f2f4c36 100644 > --- a/meta/recipes-devtools/go/go-cross-canadian.inc > +++ b/meta/recipes-devtools/go/go-cross-canadian.inc > @@ -5,6 +5,8 @@ DEPENDS = "go-native virtual/${HOST_PREFIX}go virtual/nativesdk-${HOST_PREFIX}go > virtual/nativesdk-compilerlibs" > PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" > > +GOARCH = "${HOST_GOARCH}" > + > # it uses gcc on build machine during go-cross-canadian bootstrap, but > # the gcc version may be old and not support option '-fmacro-prefix-map' > # which is one of default values of DEBUG_PREFIX_MAP > @@ -51,7 +53,7 @@ do_install() { > install -d ${D}${libdir}/go/pkg/tool > cp --preserve=mode,timestamps -R ${B}/pkg/tool/${HOST_GOTUPLE} ${D}${libdir}/go/pkg/tool/ > install -d ${D}${bindir} ${D}${libdir}/go/bin > - for f in ${B}/${GO_BUILD_BINDIR}/* > + for f in $(find ${B}/${GO_BUILD_BINDIR} -type f) > do > base=`basename $f` > install -m755 $f ${D}${libdir}/go/bin > -- > 2.43.0 >
diff --git a/meta/recipes-devtools/go/go-cross-canadian.inc b/meta/recipes-devtools/go/go-cross-canadian.inc index 39330fc98b..4a6f2f4c36 100644 --- a/meta/recipes-devtools/go/go-cross-canadian.inc +++ b/meta/recipes-devtools/go/go-cross-canadian.inc @@ -5,6 +5,8 @@ DEPENDS = "go-native virtual/${HOST_PREFIX}go virtual/nativesdk-${HOST_PREFIX}go virtual/nativesdk-compilerlibs" PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}" +GOARCH = "${HOST_GOARCH}" + # it uses gcc on build machine during go-cross-canadian bootstrap, but # the gcc version may be old and not support option '-fmacro-prefix-map' # which is one of default values of DEBUG_PREFIX_MAP @@ -51,7 +53,7 @@ do_install() { install -d ${D}${libdir}/go/pkg/tool cp --preserve=mode,timestamps -R ${B}/pkg/tool/${HOST_GOTUPLE} ${D}${libdir}/go/pkg/tool/ install -d ${D}${bindir} ${D}${libdir}/go/bin - for f in ${B}/${GO_BUILD_BINDIR}/* + for f in $(find ${B}/${GO_BUILD_BINDIR} -type f) do base=`basename $f` install -m755 $f ${D}${libdir}/go/bin
set GOARCH to HOST_GOARCH which is set from SDKMACHINE, since GOARCH defaults to TARGET_GOARCH, which is set from MACHINE (wrong arch). Also fix do_install to correctly install all binaries from ${GO_BUILD_BINDIR} by using 'find -type f' to avoid issues when the directory contains subdirectories (e.g. "linux_arm"). Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com> --- v2: - Fixed commit message --- meta/recipes-devtools/go/go-cross-canadian.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)