ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: move Windows flags detection to meson 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-04-20 17:33:50 +02:00
parent 40c909f534
commit d2147e04f9
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure vendored
View File

@ -224,10 +224,6 @@ glob() {
eval test -z '"${1#'"$2"'}"' 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:]:]"; if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]";
then then
error_exit "main directory cannot contain spaces nor colons" error_exit "main directory cannot contain spaces nor colons"
@ -2089,22 +2085,6 @@ if test "$solaris" = "no" && test "$tsan" = "no"; then
fi fi
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 # Guest agent Windows MSI package
if test "$QEMU_GA_MANUFACTURER" = ""; then if test "$QEMU_GA_MANUFACTURER" = ""; then

8
meson.build
View File

@ -182,6 +182,14 @@ qemu_cxxflags = config_host['QEMU_CXXFLAGS'].split()
qemu_objcflags = config_host['QEMU_OBJCFLAGS'].split() qemu_objcflags = config_host['QEMU_OBJCFLAGS'].split()
qemu_ldflags = config_host['QEMU_LDFLAGS'].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') if get_option('gprof')
qemu_cflags += ['-p'] qemu_cflags += ['-p']
qemu_cxxflags += ['-p'] qemu_cxxflags += ['-p']