allow hack to be applied also to out-of-boardmanager boards

Author: facchinm

add_missing_build_properties_from_parent_platform_txt_files.go

@@ -77,6 +77,11 @@ func (s *OverridePropertiesWithJsonInfo) Run(ctx *types.Context) error {
 		if ctx.TargetBoard.Properties["build.core"] == "arduino:arduino" && buildProperties[constants.HACK_PROPERTIES_AVR_GCC_NEW] != "" {
 			buildProperties[constants.HACK_PROPERTIES_AVR_GCC_OLD] =
 				"{" + constants.HACK_PROPERTIES_AVR_GCC_NEW + "}"
+			// if base runtime property is fully specified it needs to be replaced
+			if !strings.HasPrefix(buildProperties[constants.HACK_PROPERTIES_AVR_GCC_OLD_2], "{") {
+				buildProperties[constants.HACK_PROPERTIES_AVR_GCC_OLD_2] =
+					"{" + constants.HACK_PROPERTIES_AVR_GCC_NEW + "}"
+			}
 		}
 
 		ctx.BuildProperties = buildProperties

constants/constants.go

@@ -235,3 +235,4 @@ const TOOL_VERSION = "version"
 const ADDITIONALE_BOARD_MANAGER_JSON = "boardsmanager.additional.urls"
 const HACK_PROPERTIES_AVR_GCC_NEW = BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX + "avr-gcc-arduino-4.9.2-atmel3.5.3-arduino2" + BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX
 const HACK_PROPERTIES_AVR_GCC_OLD = BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX + "avr-gcc-arduino-4.8.1-arduino5" + BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX
+const HACK_PROPERTIES_AVR_GCC_OLD_2 = BUILD_PROPERTIES_RUNTIME_TOOLS_PREFIX + "avr-gcc" + BUILD_PROPERTIES_RUNTIME_TOOLS_SUFFIX