From 88a97d1a7aaeeb0122cce296c696ad7927ed052e Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Wed, 13 May 2020 11:56:28 +0200 Subject: Get rid of "Cross" in variable names Renamed Target.BrokenCrossCompiler to Target.BrokenCompiler and Target.CrossCFlags to Target.CFlags "Everything in Target is about Cross now." Signed-off-by: Alexander Potapenko --- pkg/csource/build.go | 2 +- pkg/csource/csource_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/csource') diff --git a/pkg/csource/build.go b/pkg/csource/build.go index 1269987e5..13633382e 100644 --- a/pkg/csource/build.go +++ b/pkg/csource/build.go @@ -54,7 +54,7 @@ func build(target *prog.Target, src []byte, file string, warn bool) (string, err } else { flags = append(flags, file) } - flags = append(flags, sysTarget.CrossCFlags...) + flags = append(flags, sysTarget.CFlags...) if sysTarget.PtrSize == 4 { // We do generate uint64's for syscall arguments that overflow longs on 32-bit archs. flags = append(flags, "-Wno-overflow") diff --git a/pkg/csource/csource_test.go b/pkg/csource/csource_test.go index f8248499e..61b6bcf31 100644 --- a/pkg/csource/csource_test.go +++ b/pkg/csource/csource_test.go @@ -32,7 +32,7 @@ func TestGenerate(t *testing.T) { continue } t.Run(target.OS+"/"+target.Arch, func(t *testing.T) { - if err := sysTarget.BrokenCrossCompiler; err != "" { + if err := sysTarget.BrokenCompiler; err != "" { t.Skipf("target compiler is broken: %v", err) } full := !checked[target.OS] -- cgit mrf-deployment