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

Author: sysprogs

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
 }
 

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 {

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 {

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 {