diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 13:08:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 13:08:43 +0100 |
| commit | ad089894a8b203593e1d3f77b54fd5a43dc16c5b (patch) | |
| tree | cff3b7bef30c1caa2be42a81925e821a32a5a8b6 | |
| parent | 31cc9514a50d1dc9fc71aec4e309c8af6fd83f3e (diff) | |
| parent | 50e12060696711eca1b09b82b9215ccdeaadfd09 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141015-1' into staging
configure: Prepend pixman and ftd flags to overrule system-provided ones
# gpg: Signature made Wed 15 Oct 2014 11:21:13 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-console-20141015-1:
configure: Prepend pixman and ftd flags to overrule system-provided ones
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4211,9 +4211,9 @@ EOF fi fi -# add pixman flags after all config tests are done -QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags $fdt_cflags" -libs_softmmu="$libs_softmmu $pixman_libs" +# prepend pixman and ftd flags after all config tests are done +QEMU_CFLAGS="$pixman_cflags $fdt_cflags $QEMU_CFLAGS" +libs_softmmu="$pixman_libs $libs_softmmu" echo "Install prefix $prefix" echo "BIOS directory `eval echo $qemu_datadir`" |