Skip to content

Commit

Permalink
Merge #84
Browse files Browse the repository at this point in the history
84: AppMakefile.mk: Fix the linker ordering r=ppannuto a=alistair23

Signed-off-by: Alistair Francis <[email protected]>

Co-authored-by: Alistair Francis <[email protected]>
  • Loading branch information
bors[bot] and alistair23 authored Apr 22, 2020
2 parents d9fd323 + 07b3dca commit 880b9de
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions AppMakefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ $$(BUILDDIR)/$(1)/$(1).elf: $$(OBJS_$(1)) $$(LIBS_$(1)) $$(LEGACY_LIBS_$(1)) $$(
-Xlinker --defsym=KERNEL_HEAP_SIZE=$$(KERNEL_HEAP_SIZE)\
-T $$(LAYOUT)\
-nostdlib\
$$(LINK_LIBS_$(1))\
-Wl,--start-group $$(OBJS_$(1)) $$(LIBS_$(1)) $$(LEGACY_LIBS_$(1)) -Wl,--end-group\
-Wl,--start-group $$(OBJS_$(1)) $$(LIBS_$(1)) $$(LEGACY_LIBS_$(1)) $$(LINK_LIBS_$(1)) -Wl,--end-group\
-Wl,-Map=$$(BUILDDIR)/$(1)/$(1).Map\
-o $$@

Expand Down

0 comments on commit 880b9de

Please sign in to comment.