Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fb9279f authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: change ld_flags to contain LDFLAGS_$(@F) 



Put $(LDFLAGS_$(@F)) into ld_flags so that $(LDFLAGS_pcap.o) and
$(LDFLAGS_vde.o) in arch/um/drivers/Makefile are absorbed.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
parent f60b992e

arch/um/drivers/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ LDFLAGS_vde.o := -r $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a) 
targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o



$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o

	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_pcap.o)

	$(LD) -r -dp -o $@ $^ $(ld_flags)



$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o

	$(LD) -r -dp -o $@ $^ $(LDFLAGS) $(LDFLAGS_vde.o)

	$(LD) -r -dp -o $@ $^ $(ld_flags)



#XXX: The call below does not work because the flags are added before the

# object name, so nothing from the library gets linked.

scripts/Makefile.lib

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ a_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ 
cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \

		 $(__cpp_flags)



ld_flags       = $(LDFLAGS) $(ldflags-y)

ld_flags       = $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F))



DTC_INCLUDE    := $(srctree)/scripts/dtc/include-prefixes
@@ -225,7 +225,7 @@ $(obj)/%: $(src)/%_shipped 
# ---------------------------------------------------------------------------



quiet_cmd_ld = LD      $@

cmd_ld = $(LD) $(ld_flags) $(LDFLAGS_$(@F)) $(filter-out FORCE,$^) -o $@

cmd_ld = $(LD) $(ld_flags) $(filter-out FORCE,$^) -o $@



# Objcopy

# ---------------------------------------------------------------------------