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

configure: clean up handling of CFI option 

Avoid that --enable-cfi --disable-cfi leaves b_lto set to true.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-09-26 17:20:53 +02:00
parent 655e2a778d
commit ae22ae6515
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -625,7 +625,10 @@ meson_option_build_array() {
meson_options= meson_options=
meson_option_add() { meson_option_add() {
meson_options="$meson_options $(quote_sh "$1")" local arg
for arg; do
meson_options="$meson_options $(quote_sh "$arg")"
done
} }
meson_option_parse() { meson_option_parse() {
meson_options="$meson_options $(_meson_option_parse "$@")" meson_options="$meson_options $(_meson_option_parse "$@")"
@ -767,11 +770,9 @@ for opt do
;; ;;
--disable-werror) werror="no" --disable-werror) werror="no"
;; ;;
--enable-cfi) --enable-cfi) cfi=true
cfi="true";
meson_option_add -Db_lto=true
;; ;;
--disable-cfi) cfi="false" --disable-cfi) cfi=false
;; ;;
--disable-download) download="disabled"; git_submodules_action=validate; --disable-download) download="disabled"; git_submodules_action=validate;
;; ;;
@ -1845,7 +1846,7 @@ if test "$skip_meson" = no; then
test "$werror" = yes && meson_option_add -Dwerror=true test "$werror" = yes && meson_option_add -Dwerror=true
# QEMU options # QEMU options
test "$cfi" != false && meson_option_add "-Dcfi=$cfi" test "$cfi" != false && meson_option_add "-Dcfi=$cfi" "-Db_lto=$cfi"
test "$docs" != auto && meson_option_add "-Ddocs=$docs" test "$docs" != auto && meson_option_add "-Ddocs=$docs"
test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE"
test "$plugins" = yes && meson_option_add "-Dplugins=true" test "$plugins" = yes && meson_option_add "-Dplugins=true"