diff options
| author | Alexander Entinger <consulting@lxrobotics.com> | 2019-09-18 13:26:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 13:26:11 +0200 |
| commit | 464bfc4bd0fa9be4013d8970aa7bcdbceadbdc19 (patch) | |
| tree | ed523e7fd952bef5cb05b71cf9736a792b703ff9 | |
| parent | c0b08039715a9c033b7ced12daf23e729028771c (diff) | |
| parent | 56486abd766c569020f6456690201a844a4184a2 (diff) | |
Merge pull request #284 from arduino/revert-52-master
Revert "Changed linking order, so precompiled libraries can be used"
| -rw-r--r-- | platform.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform.txt b/platform.txt index 9d18d7b..cb48698 100644 --- a/platform.txt +++ b/platform.txt @@ -65,7 +65,7 @@ archive_file_path={build.path}/{archive_file} recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}" ## Combine gc-sections, archives, and objects -recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" {object_files} {compiler.libraries.ldflags} "{build.path}/{archive_file}" "-L{build.path}" -lm +recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" "-L{build.path}" -lm ## Create output files (.eep and .hex) recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.objcopy.eep.flags} {compiler.objcopy.eep.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.eep" |