From ab8ae600586282322cf626b20e44b53e22155ada Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sat, 5 Jan 2013 15:45:27 +0000 Subject: [PATCH] Fixed incorrect ordering of the linker options in the build system causing link failures in some cases. --- LUFA/Build/lufa_build.mk | 2 +- LUFA/DoxygenPages/ChangeLog.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/LUFA/Build/lufa_build.mk b/LUFA/Build/lufa_build.mk index 8a41eb5bca..6baed1b2d9 100644 --- a/LUFA/Build/lufa_build.mk +++ b/LUFA/Build/lufa_build.mk @@ -304,7 +304,7 @@ $(OBJDIR)/%.o: %.S $(MAKEFILE_LIST) .SECONDARY : %.elf %.elf: $(OBJECT_FILES) @echo $(MSG_LINK_CMD) Linking object files into \"$@\" - $(CROSS)-gcc $(BASE_LD_FLAGS) $(LD_FLAGS) $^ -o $@ + $(CROSS)-gcc $^ -o $@ $(BASE_LD_FLAGS) $(LD_FLAGS) # Extracts out the loadable FLASH memory data from the project ELF file, and creates an Intel HEX format file of it %.hex: %.elf diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 1e2c10ccbc..5e959ac9cb 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -38,6 +38,7 @@ * - Fixed maximum allowed keyboard key code usage of \c 0x65 rather than \c 0xFF for the \c HID_DESCRIPTOR_KEYBOARD() macro (thanks to David Monro) * - Fixed hardware race condition that could cause failed device enumerations for AVR8 and UC3 architectures (thanks to Mike Beyhs) * - Fixed incorrect Minimus board LED definitions (thanks to Joonas Lahtinen) + * - Fixed incorrect ordering of the linker options in the build system causing link failures in some cases * - Library Applications: * - Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project * - Fixed incompatibility in the CDC class bootloader on some systems (thanks to Sylvain Munaut)