diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-17 16:26:35 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2013-04-18 14:12:31 +0200 |
| commit | 5b5e30370147ce3495b7509238e88ef9a6d873ec (patch) | |
| tree | 4fe40ff508a4cfd1be01af5a0c80363daa44588a | |
| parent | a540f158db41205c3f7bad8b214f9738dc00724d (diff) | |
| download | qemu-5b5e30370147ce3495b7509238e88ef9a6d873ec.zip | |
configure: QEMU_INCLUDES are the same for all subtargets
Reviewed-by: Peter Maydell <peter.maydell@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rwxr-xr-x | configure | 28 |
1 files changed, 13 insertions, 15 deletions
@@ -4008,6 +4008,19 @@ if test "$trace_default" = "yes"; then echo "CONFIG_TRACE_DEFAULT=y" >> $config_host_mak fi +if test "$tcg_interpreter" = "yes"; then + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES" +elif test "$ARCH" = "sparc64" ; then + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES" +elif test "$ARCH" = "s390x" ; then + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES" +elif test "$ARCH" = "x86_64" ; then + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES" +else + QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES" +fi +QEMU_INCLUDES="-I\$(SRC_PATH)/tcg $QEMU_INCLUDES" + echo "TOOLS=$tools" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak @@ -4379,22 +4392,8 @@ fi # generate QEMU_CFLAGS/LDFLAGS for targets cflags="" -includes="" ldflags="" -if test "$tcg_interpreter" = "yes"; then - includes="-I\$(SRC_PATH)/tcg/tci $includes" -elif test "$ARCH" = "sparc64" ; then - includes="-I\$(SRC_PATH)/tcg/sparc $includes" -elif test "$ARCH" = "s390x" ; then - includes="-I\$(SRC_PATH)/tcg/s390 $includes" -elif test "$ARCH" = "x86_64" ; then - includes="-I\$(SRC_PATH)/tcg/i386 $includes" -else - includes="-I\$(SRC_PATH)/tcg/\$(ARCH) $includes" -fi -includes="-I\$(SRC_PATH)/tcg $includes" - for i in $ARCH $TARGET_BASE_ARCH ; do case "$i" in alpha) @@ -4524,7 +4523,6 @@ fi echo "LDFLAGS+=$ldflags" >> $config_target_mak echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak -echo "QEMU_INCLUDES+=$includes" >> $config_target_mak done # for target in $targets |