aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-02-25 17:36:55 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-02-25 18:34:28 +0000
commitaa0d1f448871314bfc535da97eb003fe7766d4c2 (patch)
tree9e93f3a4342c000a0c07238f1d7d794c8ccb4346 /util
parenta89d97df1f6d9f5bd6403a9d91d9d7cd86bdd394 (diff)
modules: do not include gmodule-2.0 in static builds
gmodule-2.0's pkg-config files include -Wl,--export-dynamic, which breaks static builds. It is a glib bug, but we need to support --static builds for the linux-user targets, and in the end all that is needed to fix this is: * outlaw --enable-modules --static, which makes little sense anyway * only include gmodule-2.0's cflags and ldflags if --enable-modules is specified on the command line. Reported-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1393346215-5636-1-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
-rw-r--r--util/module.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/module.c b/util/module.c
index 42bc3732c9..dc08c16111 100644
--- a/util/module.c
+++ b/util/module.c
@@ -14,7 +14,9 @@
*/
#include <stdlib.h>
+#ifdef CONFIG_MODULES
#include <gmodule.h>
+#endif
#include "qemu-common.h"
#include "qemu/queue.h"
#include "qemu/module.h"