mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
Revert "go-cross: Fix host contamination for x86_64 host to x86_64 target"
This is breaking the build of go-cross on some machines:
Log data follows:
| DEBUG: Executing shell function do_compile
| NOTE: make -j 20 static
| ERROR: oe_runmake failed
| /home/bruce/poky/build/tmp/work/core2-64-poky-linux/containerd/0.2.2+git0ac3cd1be170d180b2baed755e8f0da547ceb267-r0/git
| cd ctr && go build -ldflags "-w -extldflags -static -X github.com/docker/containerd.GitCommit=0ac3cd1be170d180b2baed755e8f0da547ceb267 " -tags "" -o ../bin/ctr
| cd containerd && go build -ldflags "-w -extldflags -static -X github.com/docker/containerd.GitCommit=0ac3cd1be170d180b2baed755e8f0da547ceb267 " -tags "" -o ../bin/containerd
| cd containerd-shim && go build -ldflags "-w -extldflags -static -X github.com/docker/containerd.GitCommit=0ac3cd1be170d180b2baed755e8f0da547ceb267 " -tags "" -o ../bin/containerd-shim
| # github.com/docker/docker/pkg/term
| cannot load DWARF output from $WORK/github.com/docker/docker/pkg/term/_obj//_cgo_.o: decoding dwarf section info at offset 0x4: unsupported version 0
| make: *** [shim-static] Error 2
| make: *** Waiting for unfinished jobs....
| # github.com/docker/docker/pkg/term
| cannot load DWARF output from $WORK/github.com/docker/docker/pkg/term/_obj//_cgo_.o: decoding dwarf section info at offset 0x4: unsupported version 0
| # github.com/opencontainers/runc/libcontainer/system
| cannot load DWARF output from $WORK/github.com/opencontainers/runc/libcontainer/system/_obj//_cgo_
This reverts commit 7ff08e542d
.
This commit is contained in:
parent
b25af25747
commit
05d080dc34
|
@ -2,10 +2,6 @@ inherit cross
|
|||
|
||||
DEPENDS += "go-native"
|
||||
|
||||
# Prevent runstrip from running because you get errors when the host arch != target arch
|
||||
#INHIBIT_PACKAGE_STRIP = "1"
|
||||
STRIP = "echo"
|
||||
|
||||
export GOHOSTOS = "${BUILD_GOOS}"
|
||||
export GOHOSTARCH = "${BUILD_GOARCH}"
|
||||
export GOOS = "${TARGET_GOOS}"
|
||||
|
@ -30,8 +26,6 @@ do_compile() {
|
|||
|
||||
cd src
|
||||
./make.bash --host-only
|
||||
# Ensure cgo.a is built with the target toolchain
|
||||
GO_FLAGS="-a" ./make.bash --target-only
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
@ -44,9 +38,7 @@ do_install() {
|
|||
install -d ${D}${bindir}
|
||||
for f in ${B}/bin/*
|
||||
do
|
||||
if [ ! -d "$f" ] ; then
|
||||
install -m755 $f ${D}${bindir}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user