[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] configure: simplify calls to meson_quote
From: |
Paolo Bonzini |
Subject: |
[PULL 06/10] configure: simplify calls to meson_quote |
Date: |
Mon, 8 Nov 2021 15:36:12 +0100 |
meson_quote assumes a non-empty argument list, and incorrectly returns a
one-entry array if passed nothing. Move the check for an empty argument
list from the invocations to the function itself.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 33682cb971..369b5455b6 100755
--- a/configure
+++ b/configure
@@ -3894,6 +3894,7 @@ echo "TOPSRC_DIR=$source_path" >> $config_mak
if test "$skip_meson" = no; then
cross="config-meson.cross.new"
meson_quote() {
+ test $# = 0 && return
echo "'$(echo $* | sed "s/ /','/g")'"
}
@@ -3908,10 +3909,10 @@ if test "$skip_meson" = no; then
test -z "$cxx" && echo "link_language = 'c'" >> $cross
echo "[built-in options]" >> $cross
- echo "c_args = [${CFLAGS:+$(meson_quote $CFLAGS)}]" >> $cross
- echo "cpp_args = [${CXXFLAGS:+$(meson_quote $CXXFLAGS)}]" >> $cross
- echo "c_link_args = [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross
- echo "cpp_link_args = [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross
+ echo "c_args = [$(meson_quote $CFLAGS)]" >> $cross
+ echo "cpp_args = [$(meson_quote $CXXFLAGS)]" >> $cross
+ echo "c_link_args = [$(meson_quote $LDFLAGS)]" >> $cross
+ echo "cpp_link_args = [$(meson_quote $LDFLAGS)]" >> $cross
echo "[binaries]" >> $cross
echo "c = [$(meson_quote $cc $CPU_CFLAGS)]" >> $cross
test -n "$cxx" && echo "cpp = [$(meson_quote $cxx $CPU_CFLAGS)]" >> $cross
--
2.33.1
- [PULL 00/10] Misc QEMU bugfixes for 6.2 hard freeze, Paolo Bonzini, 2021/11/08
- [PULL 01/10] target-i386: mmu: use pg_mode instead of HF_LMA_MASK, Paolo Bonzini, 2021/11/08
- [PULL 06/10] configure: simplify calls to meson_quote,
Paolo Bonzini <=
- [PULL 08/10] configure: propagate --extra-cflags and --extra-ldflags to meson compile tests, Paolo Bonzini, 2021/11/08
- [PULL 02/10] target-i386: mmu: fix handling of noncanonical virtual addresses, Paolo Bonzini, 2021/11/08
- [PULL 04/10] meson: perform snappy test with the C++ compiler if used, Paolo Bonzini, 2021/11/08
- [PULL 07/10] configure: preserve CFLAGS, CXXFLAGS and LDFLAGS in config.status, Paolo Bonzini, 2021/11/08
- [PULL 03/10] hw/scsi/scsi-disk: MODE_PAGE_ALLS not allowed in MODE SELECT commands, Paolo Bonzini, 2021/11/08
- [PULL 09/10] configure: ignore preexisting QEMU_*FLAGS envvars, Paolo Bonzini, 2021/11/08
- [PULL 10/10] ui/gtk-egl: Fix build failure when libgbm is not available, Paolo Bonzini, 2021/11/08
- [PULL 05/10] docs: adjust for demise of scripts/create_config, Paolo Bonzini, 2021/11/08
- Re: [PULL 00/10] Misc QEMU bugfixes for 6.2 hard freeze, Richard Henderson, 2021/11/08