summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-12 17:01:35 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-19 08:40:27 +0900
commit2fb9279f2c3e021745d5c461894a0f6c3690db7b (patch)
treec3606899e3eb2c4d8f250f206a4ba3d3847013c5 /arch/um
parentf60b992e30ffef82fd6cd317c6fba3ccaacbe921 (diff)
downloadlinux-2fb9279f2c3e021745d5c461894a0f6c3690db7b.tar.gz
linux-2fb9279f2c3e021745d5c461894a0f6c3690db7b.tar.bz2
linux-2fb9279f2c3e021745d5c461894a0f6c3690db7b.zip
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: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
index 16b3cebddafb..693319839f69 100644
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@ -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.