The 'flags' wording is used in several places instead of 'cflags'.
$ git grep cross-cc-flags
configure: --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-flags-};
cc_arch=${cc_arch%%=*}
configure: --cross-cc-flags-ARCH= use compiler flags when building ARCH
guest tests
docs/devel/testing.rst:There is also a ``--cross-cc-flags-ARCH`` flag in case
additional
Fix this treewide.
Fixes: d422b2bc23bf ("configure: allow user to specify --cross-cc-cflags-foo=")
Fixes: f8ed349e6d14 ("docs/devel: add "check-tcg" to testing.rst")
Cc: alex.ben...@linaro.org
Signed-off-by: Greg Kurz <gr...@kaod.org>
---
configure | 4 ++--
docs/devel/testing.rst | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index b5965b159f2f..3a926ff8fc23 100755
--- a/configure
+++ b/configure
@@ -474,7 +474,7 @@ for opt do
;;
--cross-cc-*[!a-zA-Z0-9_-]*=*) error_exit "Passed bad --cross-cc-FOO option"
;;
- --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-flags-}; cc_arch=${cc_arch%%=*}
+ --cross-cc-cflags-*) cc_arch=${opt#--cross-cc-cflags-};
cc_arch=${cc_arch%%=*}
eval "cross_cc_cflags_${cc_arch}=\$optarg"
cross_cc_vars="$cross_cc_vars cross_cc_cflags_${cc_arch}"
;;
@@ -1764,7 +1764,7 @@ Advanced options (experts only):
--extra-cxxflags=CXXFLAGS append extra C++ compiler flags QEMU_CXXFLAGS
--extra-ldflags=LDFLAGS append extra linker flags LDFLAGS
--cross-cc-ARCH=CC use compiler when building ARCH guest test cases
- --cross-cc-flags-ARCH= use compiler flags when building ARCH guest tests
+ --cross-cc-cflags-ARCH=CFLAGS use compiler flags when building ARCH guest
tests
--make=MAKE use specified make [$make]
--python=PYTHON use specified python [$python]
--sphinx-build=SPHINX use specified sphinx-build [$sphinx_build]
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index 8f572255d320..a8c8aa365cf8 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -1142,7 +1142,7 @@ for the architecture in question, for example::
$(configure) --cross-cc-aarch64=aarch64-cc
-There is also a ``--cross-cc-flags-ARCH`` flag in case additional
+There is also a ``--cross-cc-cflags-ARCH`` flag in case additional
compiler flags are needed to build for a given target.
If you have the ability to run containers as the user the build system
--
2.31.1
