]> git.proxmox.com Git - mirror_qemu.git/commitdiff
configure: Allow builds without any system or user emulation
authorStefan Weil <sw@weilnetz.de>
Fri, 14 Sep 2012 17:02:30 +0000 (19:02 +0200)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 25 Sep 2012 23:44:34 +0000 (18:44 -0500)
The old code aborted configure when no emulation target was selected.
Even after removing the 'exit 1', it tried to read from STDIN
when QEMU was configured with

    configure' '--disable-user' '--disable-system'

This is fixed here.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Makefile
configure

index def2ae23cd279616d3043b72965a1b3e6f197fc5..04642975af73dab2b30f0e0650955cfbb0acd337 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,13 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
 SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS))
 
+ifeq ($(SUBDIR_DEVICES_MAK),)
+config-all-devices.mak:
+       $(call quiet-command,echo '# no devices' > $@,"  GEN   $@")
+else
 config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
        $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@,"  GEN   $@")
+endif
 
 -include $(SUBDIR_DEVICES_MAK_DEP)
 
index 1b865174e1658c9226e9f1cdd2f835d54b14bf64..8f99b7b941cf3ff4eca81869eb554719c5dea1d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1286,10 +1286,6 @@ if test -z "$target_list" ; then
 else
     target_list=`echo "$target_list" | sed -e 's/,/ /g'`
 fi
-if test -z "$target_list" ; then
-    echo "No targets enabled"
-    exit 1
-fi
 # see if system emulation was really requested
 case " $target_list " in
   *"-softmmu "*) softmmu=yes