diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-12-29 18:46:34 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-12-29 18:46:34 -0200 |
| commit | a6ec654a7a863afff41b491a02ffd696c862cb41 (patch) | |
| tree | 81aa66c89515b8be78d4b2e438d1cf17d99d8ecb /configure | |
| parent | Reinstate cpuid vendor override when kvm is enabled (diff) | |
| parent | Don't load options roms intended to be loaded by the bios in qemu (diff) | |
| download | qemu-kvm-a6ec654a7a863afff41b491a02ffd696c862cb41.tar.gz qemu-kvm-a6ec654a7a863afff41b491a02ffd696c862cb41.tar.bz2 qemu-kvm-a6ec654a7a863afff41b491a02ffd696c862cb41.zip | |
Merge branch 'stable-0.12-upstream' into stable-0.12
* stable-0.12-upstream: (7 commits)
Don't load options roms intended to be loaded by the bios in qemu
USB: Improve usbdevice error messages
cpu-all.h: fix cpu_get_real_ticks() #ifdef
alpha: fix compile
user_only: compile everything with -fpie
fdc/sparc32: don't hang on detection under OBP
scsi-disk: Inquiry with allocation length of CDB < 36 (v4)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2827,3 +2827,6 @@ d=libuser mkdir -p $d rm -f $d/Makefile ln -s $source_path/Makefile.user $d/Makefile +if test "$static" = "no" -a "$user_pie" = "yes" ; then + echo "QEMU_CFLAGS+=-fpie" > $d/config.mak +fi |