aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-01-05 15:45:27 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-01-05 15:45:27 +0000
commitab8ae600586282322cf626b20e44b53e22155ada (patch)
tree42b99a31d20bd94c4cb3db87faa85525d1d48611
parent26015d432d3f5f8c6d1816307e554520e0675f39 (diff)
downloadlufa-ab8ae600586282322cf626b20e44b53e22155ada.tar.gz
lufa-ab8ae600586282322cf626b20e44b53e22155ada.tar.bz2
lufa-ab8ae600586282322cf626b20e44b53e22155ada.zip
Fixed incorrect ordering of the linker options in the build system causing link failures in some cases.
-rw-r--r--LUFA/Build/lufa_build.mk2
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/LUFA/Build/lufa_build.mk b/LUFA/Build/lufa_build.mk
index 8a41eb5bc..6baed1b2d 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 1e2c10ccb..5e959ac9c 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)