diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-03-03 10:40:27 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-03-03 11:25:30 -0800 |
commit | 2562addd103a4d687224bb8eccebd2c5c14be62f (patch) | |
tree | 73294aca191561fb568e5a5685822a615a54ec64 | |
parent | 89fb2e9e7c6063d85be58acae518b4417ea4e7ce (diff) | |
download | meta-openembedded-2562addd103a4d687224bb8eccebd2c5c14be62f.tar.gz |
syzkaller: Fix build with go 1.21
- export GOPROXY
- Fix clang-18 found errors by not forcing C++ compiler for CC
but just passing c++ std library to link with
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-test/syzkaller/syzkaller_git.bb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index 2adc06a2b..b43207f2a 100644 --- a/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-oe/recipes-test/syzkaller/syzkaller_git.bb | |||
@@ -10,7 +10,13 @@ SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IM | |||
10 | file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ | 10 | file://0001-sys-targets-targets.go-allow-users-to-override-hardc.patch;patchdir=src/${GO_IMPORT} \ |
11 | file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ | 11 | file://0001-executor-Include-missing-linux-falloc.h.patch;patchdir=src/${GO_IMPORT} \ |
12 | " | 12 | " |
13 | SRCREV = "6d01f20890edf11b99bb54573025b11c1acd2d52" | 13 | SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" |
14 | |||
15 | export GOPROXY = "https://proxy.golang.org,direct" | ||
16 | # Workaround for network access issue during compile step. | ||
17 | # This needs to be fixed in the recipes buildsystem so that | ||
18 | # it can be accomplished during do_fetch task. | ||
19 | do_compile[network] = "1" | ||
14 | 20 | ||
15 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux" | 21 | COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64).*-linux" |
16 | 22 | ||
@@ -26,6 +32,8 @@ export TARGETVMARCH = '${GOARCH}' | |||
26 | 32 | ||
27 | CGO_ENABLED = "1" | 33 | CGO_ENABLED = "1" |
28 | 34 | ||
35 | LDFLAGS:append:class-target = "${@bb.utils.contains_any("TC_CXX_RUNTIME", "llvm android", " -lc++", " -lstdc++", d)}" | ||
36 | |||
29 | DEPENDS:class-native += "qemu-system-native" | 37 | DEPENDS:class-native += "qemu-system-native" |
30 | 38 | ||
31 | do_compile:class-native() { | 39 | do_compile:class-native() { |
@@ -46,7 +54,7 @@ do_compile:class-target() { | |||
46 | unset GOOS | 54 | unset GOOS |
47 | unset GOARCH | 55 | unset GOARCH |
48 | 56 | ||
49 | oe_runmake GO="${GO}" CC="${CXX}" CFLAGS="${CXXFLAGS} ${LDFLAGS}" REV=${SRCREV} target | 57 | oe_runmake GO="${GO}" CFLAGS="${CXXFLAGS} ${LDFLAGS}" REV=${SRCREV} target |
50 | } | 58 | } |
51 | 59 | ||
52 | do_install:class-native() { | 60 | do_install:class-native() { |