Added support for specifying extra cflags for sketch/core/libraries only

sysprogs · sysprogs · commit 79fb95b84614 · 2022-01-27T13:36:25.000-08:00
diff --git a/legacy/builder/builder_utils/utils.go b/legacy/builder/builder_utils/utils.go
@@ -125,11 +125,11 @@ func RemoveOptimizationFromBuildProperties(properties *properties.Map) *properti
 	return result
 }
 
-func ExpandSysprogsExtensionProperties(properties *properties.Map) *properties.Map {
+func ExpandSysprogsExtensionProperties(properties *properties.Map, subtype string) *properties.Map {
 	var result = properties.Clone()
 
-	result.Set("compiler.c.flags", result.Get("compiler.c.flags") + " " + result.Get("com.sysprogs.extraflags"))
-	result.Set("compiler.cpp.flags", result.Get("compiler.cpp.flags") + " " + result.Get("com.sysprogs.extraflags"))
+	result.Set("compiler.c.flags", result.Get("compiler.c.flags") + " " + result.Get("com.sysprogs.extraflags") + " " + result.Get("com.sysprogs.extraflags." + subtype))
+	result.Set("compiler.cpp.flags", result.Get("compiler.cpp.flags") + " " + result.Get("com.sysprogs.extraflags") + " " + result.Get("com.sysprogs.extraflags." + subtype))
 	return result
 }
 
diff --git a/legacy/builder/phases/core_builder.go b/legacy/builder/phases/core_builder.go
@@ -61,7 +61,7 @@ func (s *CoreBuilder) Run(ctx *types.Context) error {
 		buildProperties = builder_utils.RemoveOptimizationFromBuildProperties(buildProperties)
 	}
 	
-	buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties)
+	buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties, "core")
 	
 	archiveFile, objectFiles, err := compileCore(ctx, coreBuildPath, coreBuildCachePath, buildProperties, coreModel)
 	if err != nil {
diff --git a/legacy/builder/phases/libraries_builder.go b/legacy/builder/phases/libraries_builder.go
@@ -130,7 +130,7 @@ func compileLibraries(ctx *types.Context, libraries libraries.List, buildPath *p
 			effectiveProperties = unoptimizedProperties
 		}
 		
-		effectiveProperties = builder_utils.ExpandSysprogsExtensionProperties(effectiveProperties)	
+		effectiveProperties = builder_utils.ExpandSysprogsExtensionProperties(effectiveProperties, "lib")
 	
 		libraryObjectFiles, err := compileLibrary(ctx, library, buildPath, effectiveProperties, includes, libraryModel)
 		if err != nil {
diff --git a/legacy/builder/phases/sketch_builder.go b/legacy/builder/phases/sketch_builder.go
@@ -45,7 +45,7 @@ func (s *SketchBuilder) Run(ctx *types.Context) error {
 		buildProperties = builder_utils.RemoveOptimizationFromBuildProperties(buildProperties)
 	}
 	
-	buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties)	
+	buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties, "sketch")	
 
 	objectFiles, err := builder_utils.CompileFiles(ctx, sketchBuildPath, false, sketchBuildPath, buildProperties, includes, sketchModel)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -125,11 +125,11 @@ func RemoveOptimizationFromBuildProperties(properties properties.Map) properti`
`125`	`125`	`return result`
`126`	`126`	`}`
`127`	`127`
`128`		`-func ExpandSysprogsExtensionProperties(properties properties.Map) properties.Map {`
	`128`	`+func ExpandSysprogsExtensionProperties(properties properties.Map, subtype string) properties.Map {`
`129`	`129`	`var result = properties.Clone()`
`130`	`130`
`131`		`- result.Set("compiler.c.flags", result.Get("compiler.c.flags") + " " + result.Get("com.sysprogs.extraflags"))`
`132`		`- result.Set("compiler.cpp.flags", result.Get("compiler.cpp.flags") + " " + result.Get("com.sysprogs.extraflags"))`
	`131`	`+ result.Set("compiler.c.flags", result.Get("compiler.c.flags") + " " + result.Get("com.sysprogs.extraflags") + " " + result.Get("com.sysprogs.extraflags." + subtype))`
	`132`	`+ result.Set("compiler.cpp.flags", result.Get("compiler.cpp.flags") + " " + result.Get("com.sysprogs.extraflags") + " " + result.Get("com.sysprogs.extraflags." + subtype))`
`133`	`133`	`return result`
`134`	`134`	`}`
`135`	`135`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (s CoreBuilder) Run(ctx types.Context) error {`
`61`	`61`	`buildProperties = builder_utils.RemoveOptimizationFromBuildProperties(buildProperties)`
`62`	`62`	`}`
`63`	`63`
`64`		`- buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties)`
	`64`	`+ buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties, "core")`
`65`	`65`
`66`	`66`	`archiveFile, objectFiles, err := compileCore(ctx, coreBuildPath, coreBuildCachePath, buildProperties, coreModel)`
`67`	`67`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func compileLibraries(ctx types.Context, libraries libraries.List, buildPath p`
`130`	`130`	`effectiveProperties = unoptimizedProperties`
`131`	`131`	`}`
`132`	`132`
`133`		`- effectiveProperties = builder_utils.ExpandSysprogsExtensionProperties(effectiveProperties)`
	`133`	`+ effectiveProperties = builder_utils.ExpandSysprogsExtensionProperties(effectiveProperties, "lib")`
`134`	`134`
`135`	`135`	`libraryObjectFiles, err := compileLibrary(ctx, library, buildPath, effectiveProperties, includes, libraryModel)`
`136`	`136`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (s SketchBuilder) Run(ctx types.Context) error {`
`45`	`45`	`buildProperties = builder_utils.RemoveOptimizationFromBuildProperties(buildProperties)`
`46`	`46`	`}`
`47`	`47`
`48`		`- buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties)`
	`48`	`+ buildProperties = builder_utils.ExpandSysprogsExtensionProperties(buildProperties, "sketch")`
`49`	`49`
`50`	`50`	`objectFiles, err := builder_utils.CompileFiles(ctx, sketchBuildPath, false, sketchBuildPath, buildProperties, includes, sketchModel)`
`51`	`51`	`if err != nil {`