mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

go-runtime: prevent host leakage into target objects

Browse Source 
When building for a target whose architecture matches
the build host's, the second pass through make.bash
to build the shareable runtime would also overwrite
the target's static cgo library with host-compatibile
binaries.

Fix this by running the host-side build once and
target-only passes of make.bash twice, for static
and shareable.  This ensures that what gets installed
is target-compatible.

Also fix an issue with x86-64 targets running MUSL by
removing the pre-built (for glibc) objects for the
race detector runtime before building.

[YOCTO #12136]

(From OE-Core rev: 070f4af529c84a3c8c0b1ffc7b138bdd9e8439b7)

Signed-off-by: Matt Madison <matt@madison.systems>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Matt Madison
2017-10-04 18:21:52 +00:00
committed by Richard Purdie
parent b2646b5cf7
commit 39da5f3e13
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/go/go-runtime.inc
+15 -4
View File
@@ -15,7 +15,13 @@ export CC_FOR_TARGET="${CC}"
export CXX_FOR_TARGET="${CXX}" export CXX_FOR_TARGET="${CXX}"
export GOROOT_OVERRIDE = "1" export GOROOT_OVERRIDE = "1"
do_configure[noexec] = "1" do_configure() {
:
}
do_configure_libc-musl() {
rm -f ${S}/src/runtime/race/*.syso
}
do_compile() { do_compile() {
export GOBIN="${B}/bin" export GOBIN="${B}/bin"
@@ -23,9 +29,13 @@ do_compile() {
rm -rf ${GOBIN} ${B}/pkg rm -rf ${GOBIN} ${B}/pkg
mkdir ${GOBIN} mkdir ${GOBIN}
cd src cd src
GO_FLAGS="" ./make.bash ./make.bash --host-only
cp ${B}/pkg/tool/${BUILD_GOTUPLE}/go_bootstrap ${B}
rm -rf ${B}/pkg/${TARGET_GOTUPLE}
./make.bash --target-only
if [ -n "${GO_DYNLINK}" ]; then if [ -n "${GO_DYNLINK}" ]; then
GO_FLAGS="-buildmode=shared" GO_LDFLAGS="-extldflags \"${LDFLAGS}\"" ./make.bash cp ${B}/go_bootstrap ${B}/pkg/tool/${BUILD_GOTUPLE}
GO_FLAGS="-buildmode=shared" GO_LDFLAGS="-extldflags \"${LDFLAGS}\"" ./make.bash --target-only
fi fi
cd ${B} cd ${B}
} }
@@ -41,8 +51,9 @@ do_install() {
rm -rf ${D}${libdir}/go/pkg/obj rm -rf ${D}${libdir}/go/pkg/obj
rm -rf ${D}${libdir}/go/pkg/bootstrap rm -rf ${D}${libdir}/go/pkg/bootstrap
find src -mindepth 1 -maxdepth 1 -type d | while read srcdir; do find src -mindepth 1 -maxdepth 1 -type d | while read srcdir; do
[ "$srcdir" = "./cmd" ] || cp --preserve=mode,timestamps -R $srcdir ${D}${libdir}/go/src/ cp --preserve=mode,timestamps -R $srcdir ${D}${libdir}/go/src/
done done
rm -f ${D}${libdir}/go/src/cmd/dist/dist
} }
# Remove test binaries that cannot be relocated # Remove test binaries that cannot be relocated