* [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets
@ 2013-04-02 13:49 Paolo Bonzini
2013-04-09 16:24 ` Paolo Bonzini
2013-04-09 16:35 ` Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2013-04-02 13:49 UTC (permalink / raw)
To: qemu-devel
No need to put them in config-target.mak.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets
2013-04-02 13:49 [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets Paolo Bonzini
@ 2013-04-09 16:24 ` Paolo Bonzini
2013-04-09 16:35 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2013-04-09 16:24 UTC (permalink / raw)
Cc: qemu-devel
Il 02/04/2013 15:49, Paolo Bonzini ha scritto:
> No need to put them in config-target.mak.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets
2013-04-02 13:49 [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets Paolo Bonzini
2013-04-09 16:24 ` Paolo Bonzini
@ 2013-04-09 16:35 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2013-04-09 16:35 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On 2 April 2013 14:49, Paolo Bonzini <pbonzini@redhat.com> wrote:
> No need to put them in config-target.mak.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-09 16:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-02 13:49 [Qemu-devel] [PATCH] configure: QEMU_INCLUDES are the same for all subtargets Paolo Bonzini
2013-04-09 16:24 ` Paolo Bonzini
2013-04-09 16:35 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).