From 4dbd403fd0978b91ffe3bb2f2a749511591644dd Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 8 May 2024 12:24:46 +0200 Subject: pkg/csource: replace go:generate with go:embed go:embed is a more modern way to do this and it does not require a special Makefile step. Since go:embed cannot use paths that contains "..", the actual embeding is moved to executor package. --- pkg/csource/common.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkg/csource/common.go') diff --git a/pkg/csource/common.go b/pkg/csource/common.go index 2d62f0707..600ac43b6 100644 --- a/pkg/csource/common.go +++ b/pkg/csource/common.go @@ -13,6 +13,7 @@ import ( "sort" "strings" + "github.com/google/syzkaller/executor" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/prog" "github.com/google/syzkaller/sys/targets" @@ -35,7 +36,7 @@ func createCommonHeader(p, mmapProg *prog.Prog, replacements map[string]string, for _, def := range defines { cmd.Args = append(cmd.Args, "-D"+def) } - cmd.Stdin = strings.NewReader(commonHeader) + cmd.Stdin = bytes.NewReader(executor.CommonHeader) stderr := new(bytes.Buffer) stdout := new(bytes.Buffer) cmd.Stderr = stderr -- cgit mrf-deployment