Commit 79f3b12f authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Edgar E. Iglesias
Browse files

configure: Put cross compile flags in EXTRA_CFLAGS 



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: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@gmail.com>
parent 1773d9ee

configure

+9 −6
Original line number Diff line number Diff line
@@ -941,33 +941,36 @@ done 
case "$cpu" in

    sparc)

           LDFLAGS="-m32 $LDFLAGS"

           QEMU_CFLAGS="-m32 -mcpu=ultrasparc $QEMU_CFLAGS"

           CPU_CFLAGS="-m32 -mcpu=ultrasparc"

           ;;

    sparc64)

           LDFLAGS="-m64 $LDFLAGS"

           QEMU_CFLAGS="-m64 -mcpu=ultrasparc $QEMU_CFLAGS"

           CPU_CFLAGS="-m64 -mcpu=ultrasparc"

           ;;

    s390)

           QEMU_CFLAGS="-m31 -march=z990 $QEMU_CFLAGS"

           CPU_CFLAGS="-m31 -march=z990"

           LDFLAGS="-m31 $LDFLAGS"

           ;;

    s390x)

           QEMU_CFLAGS="-m64 -march=z990 $QEMU_CFLAGS"

           CPU_CFLAGS="-m64 -march=z990"

           LDFLAGS="-m64 $LDFLAGS"

           ;;

    i386)

           QEMU_CFLAGS="-m32 $QEMU_CFLAGS"

           CPU_CFLAGS="-m32"

           LDFLAGS="-m32 $LDFLAGS"

           cc_i386='$(CC) -m32'

           ;;

    x86_64)

           QEMU_CFLAGS="-m64 $QEMU_CFLAGS"

           CPU_CFLAGS="-m64"

           LDFLAGS="-m64 $LDFLAGS"

           cc_i386='$(CC) -m32'

           ;;

    # No special flags required for other host CPUs

esac



QEMU_CFLAGS="$CPU_CFLAGS $QEMU_CFLAGS"

EXTRA_CFLAGS="$CPU_CFLAGS $EXTRA_CFLAGS"



default_target_list=""



# these targets are portable