Moving this check earlier will make the later re-factor for enabling
by default a bit neater.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
configure | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 7f906be68d..25daabd0ff 100755
--- a/configure
+++ b/configure
@@ -923,6 +923,7 @@ for opt do
;;
--static)
static="yes"
+ plugins="no"
QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS"
;;
--mandir=*) mandir="$optarg"
@@ -2184,11 +2185,14 @@ if test "$modules" = "no" && test "$module_upgrades" =
"yes" ; then
error_exit "Can't enable module-upgrades as Modules are not enabled"
fi
-# Static linking is not possible with modules or PIE
+# Static linking is not possible with plugins, modules or PIE
if test "$static" = "yes" ; then
if test "$modules" = "yes" ; then
error_exit "static and modules are mutually incompatible"
fi
+ if test "$plugins" = "yes"; then
+ error_exit "static and plugins are mutually incompatible"
+ fi
fi
# Unconditional check for compiler __thread support
@@ -3979,7 +3983,7 @@ if test "$plugins" = "yes" &&
"Plugin support requires dynamic linking and specifying a set of symbols
" \
"that are exported to plugins. Unfortunately your linker doesn't " \
"support the flag (--dynamic-list or -exported_symbols_list) used " \
- "for this purpose. You can't build with --static."
+ "for this purpose."
fi
########################################
--
2.20.1
