From a38fb99b3fbff0c988e64bf4bf277071e18b18af Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 21 May 2024 07:14:39 +0200 Subject: 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 --- tools/syz-make/make.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/syz-make/make.go') 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}, -- cgit mrf-deployment