From patchwork Tue Feb 19 04:16:17 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v2,1/3] configure: Put cross compile flags in EXTRA_CFLAGS
Date: Mon, 18 Feb 2013 18:16:17 -0000
From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
X-Patchwork-Id: 221615
Message-Id: <3ce24095c862b1c00c61fd49a8bcdfb7da1d92f3.1361246789.git.peter.crosthwaite@xilinx.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
 Peter Crosthwaite <peter.crosthwaite@xilinx.com>, 
 david.holsgrove@xilinx.com, agraf@suse.de, kraxel@redhat.com,
 afaerber@suse.de

The cross compile CFLAGS are needed to properly build pixman (and any other
submodules). Only the EXTRA_CFLAGS set is passed to submodules not QEMU_CFLAGS,
so put the cross compile flags in EXTRA_CFLAGS instead.

Signed-off-by: Peter Crosthwaite peter.crosthwaite@xilinx.com>

---
configure |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index bf5970f..088909b 100755
--- a/configure
+++ b/configure
@@ -239,8 +239,7 @@ for opt do
   ;;
   --cpu=*) cpu="$optarg"
   ;;
-  --extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS"
-                    EXTRA_CFLAGS="$optarg"
+  --extra-cflags=*) EXTRA_CFLAGS="$optarg"
   ;;
   --extra-ldflags=*) LDFLAGS="$optarg $LDFLAGS"
                      EXTRA_LDFLAGS="$optarg"
@@ -905,33 +904,35 @@ done
 case "$cpu" in
     sparc)
            LDFLAGS="-m32 $LDFLAGS"
-           QEMU_CFLAGS="-m32 -mcpu=ultrasparc $QEMU_CFLAGS"
+           EXTRA_CFLAGS="-m32 -mcpu=ultrasparc $EXTRA_CFLAGS"
            ;;
     sparc64)
            LDFLAGS="-m64 $LDFLAGS"
-           QEMU_CFLAGS="-m64 -mcpu=ultrasparc $QEMU_CFLAGS"
+           EXTRA_CFLAGS="-m64 -mcpu=ultrasparc $EXTRA_CFLAGS"
            ;;
     s390)
-           QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS"
+           EXTRA_CFLAGS="-m31 -march=z990 $EXTRA_CFLAGS"
            LDFLAGS="-m31 $LDFLAGS"
            ;;
     s390x)
-           QEMU_CFLAGS="-m64 -march=z990 $QEMU_CFLAGS"
+           EXTRA_CFLAGS="-m64 -march=z990 $EXTRA_CFLAGS"
            LDFLAGS="-m64 $LDFLAGS"
            ;;
     i386)
-           QEMU_CFLAGS="-m32 $QEMU_CFLAGS"
+           EXTRA_CFLAGS="-m32 $EXTRA_CFLAGS"
            LDFLAGS="-m32 $LDFLAGS"
            cc_i386='$(CC) -m32'
            ;;
     x86_64)
-           QEMU_CFLAGS="-m64 $QEMU_CFLAGS"
+           EXTRA_CFLAGS="-m64 $EXTRA_CFLAGS"
            LDFLAGS="-m64 $LDFLAGS"
            cc_i386='$(CC) -m32'
            ;;
     # No special flags required for other host CPUs
 esac
 
+QEMU_CFLAGS="$EXTRA_CFLAGS $QEMU_CFLAGS"
+
 default_target_list=""
 
 # these targets are portable