From da1873aaddc53805f845e21dd4e10cb6f9148b1d Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 15 Sep 2017 15:56:48 +0200 Subject: sys/targets: move targets from sys package This breaks circular dependency between: sysgen -> sys/linux -> sys -> sysgen With this circular dependency it is very difficult to update format of generated descriptions because sysgen does not build. --- pkg/csource/csource.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/csource') diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go index 10059dd9b..7ead83deb 100644 --- a/pkg/csource/csource.go +++ b/pkg/csource/csource.go @@ -20,7 +20,7 @@ import ( "unsafe" "github.com/google/syzkaller/prog" - "github.com/google/syzkaller/sys" + "github.com/google/syzkaller/sys/targets" ) type Options struct { @@ -481,7 +481,7 @@ func preprocessCommonHeader(target *prog.Target, opts Options, handled map[strin defines = append(defines, "__NR_"+name) } - sysTarget := sys.Targets[target.OS][target.Arch] + sysTarget := targets.List[target.OS][target.Arch] defines = append(defines, sysTarget.CArch...) cmd := exec.Command("cpp", "-nostdinc", "-undef", "-fdirectives-only", "-dDI", "-E", "-P", "-") @@ -529,7 +529,7 @@ func Build(target *prog.Target, lang, src string) (string, error) { return "", fmt.Errorf("failed to create temp file: %v", err) } bin.Close() - sysTarget := sys.Targets[target.OS][target.Arch] + sysTarget := targets.List[target.OS][target.Arch] compiler := sysTarget.CCompilerPrefix + "gcc" if _, err := exec.LookPath(compiler); err != nil { return "", NoCompilerErr -- cgit mrf-deployment