From f483a079508f100dcc3f654f674f387a40e5cd6a Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Fri, 10 Feb 2017 17:11:55 -0500 Subject: puzzles: fix makefile producing temporary files in the build directory (sorry!) - thanks to Michael Sevakis for catching this Change-Id: Ia02ba7a06a55bc0741df9ce2c21f868d7e0abdd4 --- apps/plugins/puzzles/puzzles.make | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make index 6f63f0a8ee..8780986a51 100644 --- a/apps/plugins/puzzles/puzzles.make +++ b/apps/plugins/puzzles/puzzles.make @@ -44,7 +44,7 @@ endif PUZZLESOPTIMIZE := -O2 ifeq ($(MODELNAME), sansac200v2) -PUZZLESOPTIMIZE := -Os +PUZZLESOPTIMIZE := -Os # tiny plugin buffer endif # we suppress all warnings @@ -72,11 +72,11 @@ $(PUZZLES_OBJDIR)/puzzles.ovl: $(PUZZLES_OBJ) $(PUZZLES_OUTLDS) $(TLSFLIB) $(call PRINTS,LD $(@F))$(call objcopy,$(basename $@).elf,$@) else $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB) - $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(BUILDDIR)/$*.elf \ + $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(PUZZLES_OBJDIR)/$*.elf \ $(filter %.o, $^) \ $(filter %.a, $+) \ - -lgcc $(PLUGINLDFLAGS) - $(SILENT)$(call objcopy,$(BUILDDIR)/$*.elf,$@) + -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/$*.map + $(SILENT)$(call objcopy,$(PUZZLES_OBJDIR)/$*.elf,$@) endif # special pattern rule for compiling puzzles with extra flags -- cgit v1.2.3