Skip to content

Commit 464bfc4

Browse files
authored
Merge pull request #284 from arduino/revert-52-master
Revert "Changed linking order, so precompiled libraries can be used"
2 parents c0b0803 + 56486ab commit 464bfc4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: platform.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ archive_file_path={build.path}/{archive_file}
6565
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
6666

6767
## Combine gc-sections, archives, and objects
68-
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
68+
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
6969

7070
## Create output files (.eep and .hex)
7171
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"

0 commit comments

Comments
 (0)