diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-10-24 14:18:56 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-10-25 07:56:49 +0000 |
| commit | 8a06fe656dc01f535065f9d0fa098a274ca910b6 (patch) | |
| tree | 8b10c59f64c1327fbe24f35d0bde40e7f0ad09f3 | |
| parent | fa27afab3f192d643759dd4e9d2dbf9b88aaa31c (diff) | |
tools/syz-declextract: assume compilation database is in build dir
That's where it is.
| -rw-r--r-- | tools/syz-declextract/README.md | 2 | ||||
| -rw-r--r-- | tools/syz-declextract/run.go | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tools/syz-declextract/README.md b/tools/syz-declextract/README.md index 1642bfe39..bccd23304 100644 --- a/tools/syz-declextract/README.md +++ b/tools/syz-declextract/README.md @@ -39,5 +39,5 @@ make -j`nproc` syz-declextract Download `run.go`, build it and run it ``` go build run.go -./run -compile_commands $KERNEL/compile_commands.json -binary $SYZ/bin/syz-declextract -output auto.txt -sourcedir $KERNEL +./run -binary $SYZ/bin/syz-declextract -output auto.txt -sourcedir $KERNEL ``` diff --git a/tools/syz-declextract/run.go b/tools/syz-declextract/run.go index a2cdcd63b..36f1762d4 100644 --- a/tools/syz-declextract/run.go +++ b/tools/syz-declextract/run.go @@ -44,12 +44,11 @@ const ( // Output Format. func main() { var ( - compilationDatabase = flag.String("compile_commands", "compile_commands.json", "path to compilation database") - binary = flag.String("binary", "syz-declextract", "path to binary") - outFile = flag.String("output", "out.txt", "output file") - sourceDir = flag.String("sourcedir", "", "kernel source directory") - buildDir = flag.String("builddir", "", "kernel build directory (defaults to source directory)") - format = flag.String("output_format", Final, "format for output [minimal, final]") + binary = flag.String("binary", "syz-declextract", "path to binary") + outFile = flag.String("output", "out.txt", "output file") + sourceDir = flag.String("sourcedir", "", "kernel source directory") + buildDir = flag.String("builddir", "", "kernel build directory (defaults to source directory)") + format = flag.String("output_format", Final, "format for output [minimal, final]") ) defer tool.Init()() @@ -67,7 +66,8 @@ func main() { *sourceDir = filepath.Clean(osutil.Abs(*sourceDir)) *buildDir = filepath.Clean(osutil.Abs(*buildDir)) - fileData, err := os.ReadFile(*compilationDatabase) + compilationDatabase := filepath.Join(*buildDir, "compile_commands.json") + fileData, err := os.ReadFile(compilationDatabase) if err != nil { tool.Fail(err) } @@ -80,7 +80,7 @@ func main() { outputs := make(chan output, len(cmds)) files := make(chan string, len(cmds)) for w := 0; w < runtime.NumCPU(); w++ { - go worker(outputs, files, *binary, *compilationDatabase, *format) + go worker(outputs, files, *binary, compilationDatabase, *format) } for _, cmd := range cmds { |