aboutsummaryrefslogtreecommitdiffstats
path: root/tools/syz-make/make.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2024-05-21 07:14:39 +0200
committerDmitry Vyukov <dvyukov@google.com>2024-05-21 09:32:43 +0000
commita38fb99b3fbff0c988e64bf4bf277071e18b18af (patch)
tree1497a8c5077b5b07f230a6adf0842fd717b6d15c /tools/syz-make/make.go
parent98aa8d464020910064d862eff99440bfdf0dc03c (diff)
Makefile: build executor with C++ compiler
Add C++ compiler and flags to the target and build executor with the C++ compiler. This will be needed to merge syz-fuzzer in to syz-executor since it will be beefier and will most likely require linking in libc++. But also this should fix #4821 since we won't use C++ flags when building C sources (we already had work-around in pkg/csource, but not in syz-extract). Fixes #4821
Diffstat (limited to 'tools/syz-make/make.go')
-rw-r--r--tools/syz-make/make.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/syz-make/make.go b/tools/syz-make/make.go
index 6a69d5dd4..728f39352 100644
--- a/tools/syz-make/make.go
+++ b/tools/syz-make/make.go
@@ -76,7 +76,9 @@ func impl() ([]Var, error) {
{"TARGETARCH", targetArch},
{"TARGETVMARCH", targetVMArch},
{"CC", target.CCompiler},
+ {"CXX", target.CxxCompiler},
{"ADDCFLAGS", strings.Join(target.CFlags, " ")},
+ {"ADDCXXFLAGS", strings.Join(target.CxxFlags, " ")},
{"NCORES", strconv.Itoa(parallelism)},
{"EXE", target.ExeExtension},
{"NATIVEBUILDOS", target.BuildOS},