Message ID | 20220930093207.2115781-1-richard.purdie@linuxfoundation.org |
---|---|
State | Accepted, archived |
Commit | 6e652835814c389a826ad2d262ee26c14dfb48b5 |
Headers | show |
Series | go: Fix reproducibility failures | expand |
diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index e18339cddb0..02601f79925 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -50,6 +50,8 @@ do_install() { rm -rf ${D}${libdir}/go/pkg/tool rm -rf ${D}${libdir}/go/pkg/obj rm -rf ${D}${libdir}/go/pkg/bootstrap + # the cmd directory is built for the native arch so if BUILD == TARGET + rm -rf ${D}${libdir}/go/pkg/${BUILD_GOTUPLE}/cmd find src -mindepth 1 -maxdepth 1 -type d | while read srcdir; do cp --preserve=mode,timestamps -R $srcdir ${D}${libdir}/go/src/ done
We're seeing "cmd" static libs being sometimes present and sometimes not. The issue depends whether BUILD == TARGET so they're present for qemux86-64 on x86-64 hosts but not for qemux86-64 on an aarch64 system. Add an extra deletion to make the files consistent between the different hosts. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/recipes-devtools/go/go-runtime.inc | 2 ++ 1 file changed, 2 insertions(+)