Merge pull request #1246 from MeteorsLiu/esp-libc
feat: support libc/compiler-rt for small places
This commit is contained in:
@@ -16,6 +16,8 @@ type Config struct {
|
||||
GOARCH string `json:"goarch"`
|
||||
|
||||
// Compiler and linker configuration
|
||||
Libc string `json:"libc"`
|
||||
RTLib string `json:"rtlib"`
|
||||
Linker string `json:"linker"`
|
||||
LinkerScript string `json:"linkerscript"`
|
||||
CFlags []string `json:"cflags"`
|
||||
|
||||
@@ -134,6 +134,12 @@ func (l *Loader) mergeConfig(dst, src *Config) {
|
||||
if src.GOARCH != "" {
|
||||
dst.GOARCH = src.GOARCH
|
||||
}
|
||||
if src.Libc != "" {
|
||||
dst.Libc = src.Libc
|
||||
}
|
||||
if src.RTLib != "" {
|
||||
dst.RTLib = src.RTLib
|
||||
}
|
||||
if src.Linker != "" {
|
||||
dst.Linker = src.Linker
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user