summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.apfelbaum@gmail.com>2019-01-18 14:46:14 +0200
committerMarcel Apfelbaum <marcel.apfelbaum@gmail.com>2019-01-19 11:01:57 +0200
commit0f645ba16c6b76ccf2076d38460aa998198893bc (patch)
treeee7910fb7e7c0fa50cf1ec26590650e96de914f1
parent555b3d67bc64bbcc3005f6619ab42552616bd383 (diff)
downloadfocaccia-qemu-0f645ba16c6b76ccf2076d38460aa998198893bc.tar.gz
focaccia-qemu-0f645ba16c6b76ccf2076d38460aa998198893bc.zip
contrib/rdmacm-mux: fix clang compilation
Fix Commit a5d2f6f877 (contrib/rdmacm-mux: Add implementation
                       of RDMA User MAD multiplexer).

The above commit introduces a new contrib target, adding a global dependency
to libumad library in case pvrdma configuration option is enabled.
Clang forbids it:
    clang-6.0: error: -libumad: 'linker' input unused
              [-Werror,-Wunused-command-line-argument]

Fix by limiting the scope to the rdmacm-mux target itself.

Reported-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Yuval Shaia <yuval.shaia@oracle.com>
Tested-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20190118124614.24548-4-marcel.apfelbaum@gmail.com>
Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
-rw-r--r--Makefile2
-rw-r--r--contrib/rdmacm-mux/Makefile.objs1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index dccba1dca2..c9bdb67274 100644
--- a/Makefile
+++ b/Makefile
@@ -581,6 +581,8 @@ vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
 	$(call LINK, $^)
 vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a
 	$(call LINK, $^)
+
+rdmacm-mux$(EXESUF): LIBS += "-libumad"
 rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
 	$(call LINK, $^)
 
diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs
index e1ff4fe569..3df744af89 100644
--- a/contrib/rdmacm-mux/Makefile.objs
+++ b/contrib/rdmacm-mux/Makefile.objs
@@ -1,4 +1,3 @@
 ifdef CONFIG_PVRDMA
-CFLAGS += -libumad
 rdmacm-mux-obj-y = main.o
 endif