[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all s
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets |
Date: |
Tue, 09 Apr 2013 18:24:50 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 |
Il 02/04/2013 15:49, Paolo Bonzini ha scritto:
> No need to put them in config-target.mak.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> configure | 36 +++++++++++++++++-------------------
> 1 file changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/configure b/configure
> index fbea75e..04c2618 100755
> --- a/configure
> +++ b/configure
> @@ -3860,6 +3860,23 @@ 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"
> +
> +if test "$linux" = "yes" ; then
> + QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
> +fi
> +
> echo "TOOLS=$tools" >> $config_host_mak
> echo "ROMS=$roms" >> $config_host_mak
> echo "MAKE=$make" >> $config_host_mak
> @@ -4236,26 +4253,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"
> -
> -if test "$linux" = "yes" ; then
> - includes="-I\$(SRC_PATH)/linux-headers $includes"
> -fi
> -
> for i in $ARCH $TARGET_BASE_ARCH ; do
> case "$i" in
> alpha)
> @@ -4391,7 +4390,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
>
>
Ping.
Paolo