Variant files must NOT be included in core.a, they MUST be passed to linker

one by one. Fixes #72

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

Author: Federico Fissore

src/arduino.cc/builder/constants/constants.go

@@ -113,6 +113,7 @@ const CTX_LIBRARY_RESOLUTION_RESULTS = "libraryResolutionResults"
 const CTX_LINE_OFFSET = "lineOffset"
 const CTX_LINE_WHERE_TO_INSERT_PROTOTYPES = "lineWhereToInsertPrototypes"
 const CTX_LOGGER = "logger"
+const CTX_OBJECT_FILES_CORE = "objectFilesCore"
 const CTX_OBJECT_FILES_LIBRARIES = "objectFilesLibraries"
 const CTX_OBJECT_FILES_SKETCH = "objectFilesSketch"
 const CTX_OTHER_LIBRARIES_FOLDERS = "otherLibrariesFolders"

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

@@ -50,21 +50,22 @@ func (s *CoreBuilder) Run(context map[string]interface{}) error {
 		return utils.WrapError(err)
 	}
 
-	archiveFile, err := compileCore(coreBuildPath, buildProperties, verbose, warningsLevel, logger)
+	archiveFile, objectFiles, err := compileCore(coreBuildPath, buildProperties, verbose, warningsLevel, logger)
 	if err != nil {
 		return utils.WrapError(err)
 	}
 
 	context[constants.CTX_ARCHIVE_FILE_PATH_CORE] = archiveFile
+	context[constants.CTX_OBJECT_FILES_CORE] = objectFiles
 
 	return nil
 }
 
-func compileCore(buildPath string, buildProperties map[string]string, verbose bool, warningsLevel string, logger i18n.Logger) (string, error) {
+func compileCore(buildPath string, buildProperties map[string]string, verbose bool, warningsLevel string, logger i18n.Logger) (string, []string, error) {
 	coreFolder := buildProperties[constants.BUILD_PROPERTIES_BUILD_CORE_PATH]
 	variantFolder := buildProperties[constants.BUILD_PROPERTIES_BUILD_VARIANT_PATH]
 
-	var includes []string
+	includes := []string{}
 	includes = append(includes, coreFolder)
 	if variantFolder != constants.EMPTY_STRING {
 		includes = append(includes, variantFolder)
@@ -73,25 +74,23 @@ func compileCore(buildPath string, buildProperties map[string]string, verbose bo
 
 	var err error
 
-	var variantObjectFiles []string
+	variantObjectFiles := []string{}
 	if variantFolder != constants.EMPTY_STRING {
 		variantObjectFiles, err = builder_utils.CompileFiles(variantObjectFiles, variantFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
 		if err != nil {
-			return "", utils.WrapError(err)
+			return "", nil, utils.WrapError(err)
 		}
 	}
 
 	coreObjectFiles, err := builder_utils.CompileFiles([]string{}, coreFolder, true, buildPath, buildProperties, includes, verbose, warningsLevel, logger)
 	if err != nil {
-		return "", utils.WrapError(err)
+		return "", nil, utils.WrapError(err)
 	}
 
-	objectFiles := append(coreObjectFiles, variantObjectFiles...)
-
-	archiveFile, err := builder_utils.ArchiveCompiledFiles(buildPath, "core.a", objectFiles, buildProperties, verbose, logger)
+	archiveFile, err := builder_utils.ArchiveCompiledFiles(buildPath, "core.a", coreObjectFiles, buildProperties, verbose, logger)
 	if err != nil {
-		return "", utils.WrapError(err)
+		return "", nil, utils.WrapError(err)
 	}
 
-	return archiveFile, nil
+	return archiveFile, variantObjectFiles, nil
 }

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

@@ -43,10 +43,12 @@ type Linker struct{}
 func (s *Linker) Run(context map[string]interface{}) error {
 	objectFilesSketch := context[constants.CTX_OBJECT_FILES_SKETCH].([]string)
 	objectFilesLibraries := context[constants.CTX_OBJECT_FILES_LIBRARIES].([]string)
+	objectFilesCore := context[constants.CTX_OBJECT_FILES_CORE].([]string)
 
 	var objectFiles []string
 	objectFiles = append(objectFiles, objectFilesSketch...)
 	objectFiles = append(objectFiles, objectFilesLibraries...)
+	objectFiles = append(objectFiles, objectFilesCore...)
 
 	coreArchiveFilePath := context[constants.CTX_ARCHIVE_FILE_PATH_CORE].(string)
 	buildPath := context[constants.CTX_BUILD_PATH].(string)

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

@@ -34,6 +34,7 @@ import (
 	"arduino.cc/builder/constants"
 	"github.com/stretchr/testify/require"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"testing"
 )
@@ -216,6 +217,11 @@ func TestBuilderBridgeSAM(t *testing.T) {
 	NoError(t, err)
 	_, err = os.Stat(filepath.Join(buildPath, constants.FOLDER_LIBRARIES, "Bridge", "Mailbox.cpp.o"))
 	NoError(t, err)
+
+	cmd := exec.Command(filepath.Join("downloaded_tools", "arm-none-eabi-gcc", "4.8.3-2014q1", "bin", "arm-none-eabi-objdump"), "-f", filepath.Join(buildPath, constants.FOLDER_CORE, "core.a"))
+	bytes, err := cmd.CombinedOutput()
+	NoError(t, err)
+	require.NotContains(t, string(bytes), "variant.cpp.o")
 }
 
 func TestBuilderBridgeRedBearLab(t *testing.T) {