diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-08-08 08:30:42 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-08-08 08:30:42 +0000 |
| commit | 5f3a1b262970f7423bc83a2f6eabcd1d4d7c65af (patch) | |
| tree | 654ff1e6ea5334bfbac0f02058af3b43f0ef3d07 /Bootloaders | |
| parent | 3c72896e84f54dab6d604518a355b37ea318df21 (diff) | |
| download | lufa-5f3a1b262970f7423bc83a2f6eabcd1d4d7c65af.tar.gz lufa-5f3a1b262970f7423bc83a2f6eabcd1d4d7c65af.tar.bz2 lufa-5f3a1b262970f7423bc83a2f6eabcd1d4d7c65af.zip | |
Fix invocations of avr-size in all makefiles broken on unpatched *nix systems, due to the recent update to the latest WinAVR makefile template.
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/makefile | 5 | ||||
| -rw-r--r-- | Bootloaders/DFU/makefile | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 346912c64..abc7c82a3 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -494,7 +494,10 @@ end: # Display size of file. HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex -ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf +ELFSIZE = $(SIZE) $(MCU_FLAG) $(FORMAT_FLAG) $(TARGET).elf +MCU_FLAG = $(shell $(SIZE) --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) ) +FORMAT_FLAG = $(shell $(SIZE) --help | grep -- --format=.*avr > /dev/null && echo --format=avr ) + sizebefore: @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \ diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index deb53125f..f6178b5e5 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -495,7 +495,10 @@ end: # Display size of file. HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex -ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf +ELFSIZE = $(SIZE) $(MCU_FLAG) $(FORMAT_FLAG) $(TARGET).elf +MCU_FLAG = $(shell $(SIZE) --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) ) +FORMAT_FLAG = $(shell $(SIZE) --help | grep -- --format=.*avr > /dev/null && echo --format=avr ) + sizebefore: @if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \ |