configure: move Windows flags detection to meson
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
40c909f534
commit
d2147e04f9
20
configure
vendored
20
configure
vendored
@ -224,10 +224,6 @@ glob() {
|
||||
eval test -z '"${1#'"$2"'}"'
|
||||
}
|
||||
|
||||
ld_has() {
|
||||
$ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1
|
||||
}
|
||||
|
||||
if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]";
|
||||
then
|
||||
error_exit "main directory cannot contain spaces nor colons"
|
||||
@ -2089,22 +2085,6 @@ if test "$solaris" = "no" && test "$tsan" = "no"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# Use ASLR, no-SEH and DEP if available
|
||||
if test "$mingw32" = "yes" ; then
|
||||
flags="--no-seh --nxcompat"
|
||||
|
||||
# Disable ASLR for debug builds to allow debugging with gdb
|
||||
if test "$debug" = "no" ; then
|
||||
flags="--dynamicbase $flags"
|
||||
fi
|
||||
|
||||
for flag in $flags; do
|
||||
if ld_has $flag ; then
|
||||
QEMU_LDFLAGS="-Wl,$flag $QEMU_LDFLAGS"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Guest agent Windows MSI package
|
||||
|
||||
if test "$QEMU_GA_MANUFACTURER" = ""; then
|
||||
|
@ -182,6 +182,14 @@ qemu_cxxflags = config_host['QEMU_CXXFLAGS'].split()
|
||||
qemu_objcflags = config_host['QEMU_OBJCFLAGS'].split()
|
||||
qemu_ldflags = config_host['QEMU_LDFLAGS'].split()
|
||||
|
||||
if targetos == 'windows'
|
||||
qemu_ldflags += cc.get_supported_link_arguments('-Wl,--no-seh', '-Wl,--nxcompat')
|
||||
# Disable ASLR for debug builds to allow debugging with gdb
|
||||
if get_option('optimization') == '0'
|
||||
qemu_ldflags += cc.get_supported_link_arguments('-Wl,--dynamicbase')
|
||||
endif
|
||||
endif
|
||||
|
||||
if get_option('gprof')
|
||||
qemu_cflags += ['-p']
|
||||
qemu_cxxflags += ['-p']
|
||||
|
Loading…
Reference in New Issue
Block a user