diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-05-13 12:52:12 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-05-13 23:07:57 -0400 |
commit | 67807f2bc32c713805a223574abf645a44545f99 (patch) | |
tree | 9edea31cf565ecb97b3ed5c55d5a772f907585c1 /recipes-containers | |
parent | 339b69f29ed571b6b2822ac3d4516d1784837ab8 (diff) | |
download | meta-virtualization-67807f2bc32c713805a223574abf645a44545f99.tar.gz |
Revert "runc-opencontainers: use bfd even with ld-is-gold"
This reverts commit dda5ae36b44c61e61439341ea3153e6be5cb015e.
binutils gold linker was fixed with:
https://git.openembedded.org/openembedded-core/commit/?id=d07d4d739ae17787017f771dd2068fda0e836722
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r-- | recipes-containers/runc/runc-opencontainers_git.bb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb index 51ba7c9b..f3ff9a86 100644 --- a/recipes-containers/runc/runc-opencontainers_git.bb +++ b/recipes-containers/runc/runc-opencontainers_git.bb | |||
@@ -8,10 +8,3 @@ SRC_URI = " \ | |||
8 | RUNC_VERSION = "1.0.0-rc93" | 8 | RUNC_VERSION = "1.0.0-rc93" |
9 | 9 | ||
10 | CVE_PRODUCT = "runc" | 10 | CVE_PRODUCT = "runc" |
11 | |||
12 | # use BFD when ld-is-gold is used to work around: | ||
13 | # http://errors.yoctoproject.org/Errors/Details/580099/ | ||
14 | # CGO_ENABLED=1 x86_64-oe-linux-go build -trimpath -tags "seccomp seccomp netgo osusergo" -ldflags "-w -extldflags -static -X main.gitCommit="fce58ab2d5c488bc573d02712db476a6daa9a60c-dirty" -X main.version=1.0.0-rc93+dev " -o runc . | ||
15 | # TOPDIR/tmp-glibc/work/core2-64-oe-linux/runc-opencontainers/1.0.0-rc93+gitAUTOINC+fce58ab2d5-r0/recipe-sysroot-native/usr/bin/x86_64-oe-linux/../../libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/11.0.1/ld: internal error in format_file_lineno, at ../../gold/dwarf_reader.cc:2278 | ||
16 | # collect2: error: ld returned 1 exit status | ||
17 | LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" | ||