Linker definition in toolchain

djphoenix · Nov 18, 2016 · 3dc186b · 3dc186b
1 parent 5197e2c
commit 3dc186b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/makefiles/defs.mk b/makefiles/defs.mk
@@ -46,5 +46,5 @@ MODOBJS += $(OOBJDIR)/mod_$$(LIBNAME_$(1)).o
 $(OOBJDIR)/mod_$$(LIBNAME_$(1)).o: $$(OBJS_$(1))
 	@ mkdir -p $$(dir $$@)
 	$(QECHO) MODLD $$(patsubst %/,%,$(1))
-	$(Q) $(CC) $(CFLAGS) -Lld -Tmodule.ld -r -s -o $$@ $$?
+	$(Q) $(LD) $(CFLAGS) -Lld -Tmodule.ld -r -o $$@ $$?
 endef
diff --git a/makefiles/rules.mk b/makefiles/rules.mk
@@ -37,7 +37,7 @@ $(OOBJDIR)/%.o: $(SRCDIR)/%.s
 $(BIN).elf: $(KERNOBJS) $(OOBJDIR)/modules-linked.o
 	@ mkdir -p $(dir $@)
 	$(QECHO) LD $(subst $(OIMGDIR)/,,$@)
-	$(Q) $(CC) $(CFLAGS) -Lld -Tsystem.ld -o $@ -Wl,--start-group $^ -Wl,--end-group
+	$(Q) $(LD) $(CFLAGS) -Lld -Tsystem.ld -o $@ -Wl,--start-group $^ -Wl,--end-group
 
 $(BIN).elf.strip: $(BIN).elf
 	$(Q) $(STRIP) -o $@ $^

diff --git a/makefiles/toolchain.mk b/makefiles/toolchain.mk
@@ -26,6 +26,7 @@ else
 endif
 
 CC=$(PREFIX)g++
+LD=$(PREFIX)g++
 AR=$(PREFIX)ar
 OBJCOPY=$(PREFIX)objcopy
 STRIP=$(PREFIX)strip