Skip to content

Commit 33e564f

Browse files
committed
Moved build artifacts into root build folder
The intermediate files used for build (.o, .a ...) are still in subfolders to avoid conflicts. Fix #3807
1 parent c7059c1 commit 33e564f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

avr/platform.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ recipe.S.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.S.flags} -mmcu={b
6565
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{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}/sketch/{build.project_name}.elf" {object_files} "{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)
71-
recipe.objcopy.eep.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.objcopy.eep.flags} {compiler.objcopy.eep.extra_flags} "{build.path}/sketch/{build.project_name}.elf" "{build.path}/sketch/{build.project_name}.eep"
72-
recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/sketch/{build.project_name}.elf" "{build.path}/sketch/{build.project_name}.hex"
71+
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"
72+
recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
7373

7474
## Save hex
7575
recipe.output.tmp_file={build.project_name}.hex
7676
recipe.output.save_file={build.project_name}.{build.variant}.hex
7777

7878
## Compute size
79-
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/sketch/{build.project_name}.elf"
79+
recipe.size.pattern="{compiler.path}{compiler.size.cmd}" -A "{build.path}/{build.project_name}.elf"
8080
recipe.size.regex=^(?:\.text|\.data|\.bootloader)\s+([0-9]+).*
8181
recipe.size.regex.data=^(?:\.data|\.bss|\.noinit)\s+([0-9]+).*
8282
recipe.size.regex.eeprom=^(?:\.eeprom)\s+([0-9]+).*
@@ -97,11 +97,11 @@ tools.avrdude.config.path={path}/etc/avrdude.conf
9797

9898
tools.avrdude.upload.params.verbose=-v
9999
tools.avrdude.upload.params.quiet=-q -q
100-
tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D "-Uflash:w:{build.path}/sketch/{build.project_name}.hex:i"
100+
tools.avrdude.upload.pattern="{cmd.path}" "-C{config.path}" {upload.verbose} -p{build.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} -D "-Uflash:w:{build.path}/{build.project_name}.hex:i"
101101

102102
tools.avrdude.program.params.verbose=-v
103103
tools.avrdude.program.params.quiet=-q -q
104-
tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/sketch/{build.project_name}.hex:i"
104+
tools.avrdude.program.pattern="{cmd.path}" "-C{config.path}" {program.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
105105

106106
tools.avrdude.erase.params.verbose=-v
107107
tools.avrdude.erase.params.quiet=-q -q

0 commit comments

Comments
 (0)