From 4b83c85945efe862c8e007a3df85b07815664dea Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 27 Sep 2017 11:48:07 +0200 Subject: Makefile: name windows executables with .exe suffix --- syz-manager/mgrconfig/mgrconfig.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'syz-manager') diff --git a/syz-manager/mgrconfig/mgrconfig.go b/syz-manager/mgrconfig/mgrconfig.go index b0e3935bb..523cbb585 100644 --- a/syz-manager/mgrconfig/mgrconfig.go +++ b/syz-manager/mgrconfig/mgrconfig.go @@ -107,9 +107,16 @@ func load(data []byte, filename string) (*Config, error) { return nil, err } - cfg.SyzFuzzerBin = filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+cfg.TargetVMArch, "syz-fuzzer") - cfg.SyzExecprogBin = filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+cfg.TargetVMArch, "syz-execprog") - cfg.SyzExecutorBin = filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+cfg.TargetArch, "syz-executor") + targetBin := func(name string) string { + exe := "" + if cfg.TargetOS == "windows" { + exe = ".exe" + } + return filepath.Join(cfg.Syzkaller, "bin", cfg.TargetOS+"_"+cfg.TargetVMArch, name+exe) + } + cfg.SyzFuzzerBin = targetBin("syz-fuzzer") + cfg.SyzExecprogBin = targetBin("syz-execprog") + cfg.SyzExecutorBin = targetBin("syz-executor") if !osutil.IsExist(cfg.SyzFuzzerBin) { return nil, fmt.Errorf("bad config syzkaller param: can't find %v", cfg.SyzFuzzerBin) } -- cgit mrf-deployment