summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-02-12 17:53:31 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-02-12 17:53:31 +0000
commit9d74f6fef0801ca2ce5c9d38d59b85bf03c27669 (patch)
treee0422ef4ea851ed0774c0253bcd4c38ea9539732
parent628a746cf0d380ba8fc0fff2926c899e323768a7 (diff)
parent73db416ae7941f8ffeabc060ec87402b97314b6d (diff)
downloadqemu-9d74f6fef0801ca2ce5c9d38d59b85bf03c27669.tar.gz
Merge remote-tracking branch 'remotes/alon/pull-libcacard.glusterfs' into staging
* remotes/alon/pull-libcacard.glusterfs: libcacard: Don't link with all libraries QEMU links to Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--libcacard/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile
index 4d15da49b8..6b064485fa 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -25,7 +25,7 @@ vscclient$(EXESUF): libcacard/vscclient.o libcacard.la
libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \
-export-syms $(SRC_PATH)/libcacard/libcacard.syms
-libcacard.la: LIBS += $(libcacard_libs)
+libcacard.la: LIBS = $(libcacard_libs)
libcacard.la: $(libcacard-lobj-y)
$(call LINK,$^)