Merge some duplicate code into prepareGCCPreprocRecipeProperties

Signed-off-by: Matthijs Kooijman <[email protected]>

Author: matthijskooijman

Diff for: src/arduino.cc/builder/gcc_preproc_runner.go

@@ -46,11 +46,6 @@ func GCCPreprocRunner(ctx *types.Context, sourceFilePath string, targetFilePath
 		return i18n.WrapError(err)
 	}
 
-	if properties[constants.RECIPE_PREPROC_MACROS] == constants.EMPTY_STRING {
-		//generate PREPROC_MACROS from RECIPE_CPP_PATTERN
-		properties[constants.RECIPE_PREPROC_MACROS] = GeneratePreprocPatternFromCompile(properties[constants.RECIPE_CPP_PATTERN])
-	}
-
 	_, _, err = builder_utils.ExecRecipe(ctx, properties, constants.RECIPE_PREPROC_MACROS, true, /* stdout */ utils.ShowIfVerbose, /* stderr */ utils.Show)
 	if err != nil {
 		return i18n.WrapError(err)
@@ -65,11 +60,6 @@ func GCCPreprocRunnerForDiscoveringIncludes(ctx *types.Context, sourceFilePath s
 		return nil, i18n.WrapError(err)
 	}
 
-	if properties[constants.RECIPE_PREPROC_MACROS] == constants.EMPTY_STRING {
-		//generate PREPROC_MACROS from RECIPE_CPP_PATTERN
-		properties[constants.RECIPE_PREPROC_MACROS] = GeneratePreprocPatternFromCompile(properties[constants.RECIPE_CPP_PATTERN])
-	}
-
 	_, stderr, err := builder_utils.ExecRecipe(ctx, properties, constants.RECIPE_PREPROC_MACROS, true, /* stdout */ utils.ShowIfVerbose, /* stderr */ utils.Capture)
 	if err != nil {
 		return stderr, i18n.WrapError(err)
@@ -87,6 +77,11 @@ func prepareGCCPreprocRecipeProperties(ctx *types.Context, sourceFilePath string
 	properties[constants.BUILD_PROPERTIES_INCLUDES] = strings.Join(includes, constants.SPACE)
 	builder_utils.RemoveHyphenMDDFlagFromGCCCommandLine(properties)
 
+	if properties[constants.RECIPE_PREPROC_MACROS] == constants.EMPTY_STRING {
+		//generate PREPROC_MACROS from RECIPE_CPP_PATTERN
+		properties[constants.RECIPE_PREPROC_MACROS] = GeneratePreprocPatternFromCompile(properties[constants.RECIPE_CPP_PATTERN])
+	}
+
 	return properties, nil
 }