From 09d168da0427977504dd18e7ddd3bb7bda2670f3 Mon Sep 17 00:00:00 2001 From: Michael LeMay Date: Fri, 20 Nov 2015 15:07:51 -0800 Subject: [PATCH] galileo: Add support for old versions of GNU Make This patch revises a Makefile to avoid using a feature that is incompatible with GNU Make v.3.81. --- platform/galileo/Makefile.customrules-galileo | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/galileo/Makefile.customrules-galileo b/platform/galileo/Makefile.customrules-galileo index d0527cf8f..cb5bc26a9 100644 --- a/platform/galileo/Makefile.customrules-galileo +++ b/platform/galileo/Makefile.customrules-galileo @@ -24,15 +24,16 @@ debug: $(MULTIBOOT) @$(GDB) $< -ex "target remote :3333" CUSTOM_RULE_LINK=1 -define LINK_template = -%.$(1): %.co $$(PROJECT_OBJECTFILES) $$(PROJECT_LIBRARIES) contiki-$$(TARGET).a - $$(TRACE_LD) - $$(Q)$$(LD) $$(LDFLAGS) $(2) $$(TARGET_STARTFILES) $${filter-out %.a,$$^} \ - $${filter %.a,$$^} $$(TARGET_LIBFILES) -o $$@ -endef -$(eval $(call LINK_template,$(MULTIBOOT_SFX),$(MULTIBOOT_LDFLAGS))) -$(eval $(call LINK_template,$(UEFI_DLL_SFX),$(UEFI_LDFLAGS))) +%.$(MULTIBOOT_SFX): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a + $(TRACE_LD) + $(Q)$(LD) $(LDFLAGS) $(MULTIBOOT_LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} \ + ${filter %.a,$^} $(TARGET_LIBFILES) -o $@ + +%.$(UEFI_DLL_SFX): %.co $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) contiki-$(TARGET).a + $(TRACE_LD) + $(Q)$(LD) $(LDFLAGS) $(UEFI_LDFLAGS) $(TARGET_STARTFILES) ${filter-out %.a,$^} \ + ${filter %.a,$^} $(TARGET_LIBFILES) -o $@ %.$(UEFI_SFX): %.$(UEFI_DLL_SFX) $(Q)$(GEN_FW) -o $@ -e UEFI_APPLICATION $^