Added BUILD_PROPERTIES_ARCHIVE_FILE_PATH to linker props

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

src/arduino.cc/builder/phases/linker.go

@@ -60,15 +60,15 @@ func (s *Linker) Run(context map[string]interface{}) error {
 	warningsLevel := context[constants.CTX_WARNINGS_LEVEL].(string)
 	logger := context[constants.CTX_LOGGER].(i18n.Logger)
 
-	err = link(objectFiles, coreDotARelPath, buildProperties, verbose, warningsLevel, logger)
+	err = link(objectFiles, coreDotARelPath, coreArchiveFilePath, buildProperties, verbose, warningsLevel, logger)
 	if err != nil {
 		return utils.WrapError(err)
 	}
 
 	return nil
 }
 
-func link(objectFiles []string, coreArchiveFilePath string, buildProperties map[string]string, verbose bool, warningsLevel string, logger i18n.Logger) error {
+func link(objectFiles []string, coreDotARelPath string, coreArchiveFilePath string, buildProperties map[string]string, verbose bool, warningsLevel string, logger i18n.Logger) error {
 	optRelax := addRelaxTrickIfATMEGA2560(buildProperties)
 
 	objectFiles = utils.Map(objectFiles, wrapWithDoubleQuotes)
@@ -77,7 +77,8 @@ func link(objectFiles []string, coreArchiveFilePath string, buildProperties map[
 	properties := utils.MergeMapsOfStrings(make(map[string]string), buildProperties)
 	properties[constants.BUILD_PROPERTIES_COMPILER_C_ELF_FLAGS] = properties[constants.BUILD_PROPERTIES_COMPILER_C_ELF_FLAGS] + optRelax
 	properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS] = properties[constants.BUILD_PROPERTIES_COMPILER_WARNING_FLAGS+"."+warningsLevel]
-	properties[constants.BUILD_PROPERTIES_ARCHIVE_FILE] = coreArchiveFilePath
+	properties[constants.BUILD_PROPERTIES_ARCHIVE_FILE] = coreDotARelPath
+	properties[constants.BUILD_PROPERTIES_ARCHIVE_FILE_PATH] = coreArchiveFilePath
 	properties[constants.BUILD_PROPERTIES_OBJECT_FILES] = objectFileList
 
 	_, err := builder_utils.ExecRecipe(properties, constants.RECIPE_C_COMBINE_PATTERN, false, verbose, verbose, logger)

src/arduino.cc/builder/test/helper.go

@@ -32,14 +32,14 @@ package test
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
+	"bytes"
 	"fmt"
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"path/filepath"
 	"testing"
 	"text/template"
-	"bytes"
 )
 
 func LoadAndInterpolate(t *testing.T, filename string, context map[string]interface{}) string {

src/arduino.cc/builder/test/sketch_source_merger_test.go

@@ -39,7 +39,6 @@ import (
 	"testing"
 )
 
-
 func TestMergeSketch(t *testing.T) {
 	context := make(map[string]interface{})
 	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch1", "sketch.ino")