diff --git a/compileopts/config.go b/compileopts/config.go index 58af7a8c..d6979213 100644 --- a/compileopts/config.go +++ b/compileopts/config.go @@ -184,7 +184,7 @@ func (c *Config) AutomaticStackSize() bool { // CFlags returns the flags to pass to the C compiler. This is necessary for CGo // preprocessing. func (c *Config) CFlags() []string { - cflags := append([]string{}, c.Options.CFlags...) + var cflags []string for _, flag := range c.Target.CFlags { cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT"))) } @@ -205,7 +205,7 @@ func (c *Config) CFlags() []string { func (c *Config) LDFlags() []string { root := goenv.Get("TINYGOROOT") // Merge and adjust LDFlags. - ldflags := append([]string{}, c.Options.LDFlags...) + var ldflags []string for _, flag := range c.Target.LDFlags { ldflags = append(ldflags, strings.ReplaceAll(flag, "{root}", root)) } diff --git a/compileopts/options.go b/compileopts/options.go index d1c7c6ed..a12a92cd 100644 --- a/compileopts/options.go +++ b/compileopts/options.go @@ -28,8 +28,6 @@ type Options struct { Debug bool PrintSizes string PrintStacks bool - CFlags []string - LDFlags []string Tags string WasmAbi string TestConfig TestConfig diff --git a/main.go b/main.go index dd91b3e1..0a8f0686 100644 --- a/main.go +++ b/main.go @@ -859,8 +859,6 @@ func main() { ocdOutput := flag.Bool("ocd-output", false, "print OCD daemon output during debug") port := flag.String("port", "", "flash port (can specify multiple candidates separated by commas)") programmer := flag.String("programmer", "", "which hardware programmer to use") - cFlags := flag.String("cflags", "", "additional cflags for compiler") - ldFlags := flag.String("ldflags", "", "additional ldflags for linker") wasmAbi := flag.String("wasm-abi", "", "WebAssembly ABI conventions: js (no i64 params) or generic") var flagJSON, flagDeps *bool @@ -908,14 +906,6 @@ func main() { Programmer: *programmer, } - if *cFlags != "" { - options.CFlags = strings.Split(*cFlags, " ") - } - - if *ldFlags != "" { - options.LDFlags = strings.Split(*ldFlags, " ") - } - os.Setenv("CC", "clang -target="+*target) err := options.Verify()