From c6808d42963d78a816c0b8df77b81ed42d8039e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= Date: Thu, 10 Feb 2022 00:47:16 +0100 Subject: [PATCH] configure: Fix -redo when configure line contained equal sign(s) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the original configure arguments contained equal sign(s) like in configure ... -- -DQT_BUILD_SUBMODULES=qtbase;... The following error message was printed: =qtbase was unexpected at this time. The reason is that the conditional if "%rargs%" == "" would expand to something like if ""-DQT_BUILD_SUBMODULES=qtsvg"" == "" which is invalid, because the equal sign is used outside of a string literal. Use delayed expansion in the conditional to fix this. Pick-to: 6.2 6.3 Change-Id: I8c40d799db2c5aae8cba190ed31804c71a605935 Reviewed-by: Jörg Bornemann --- configure.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.bat b/configure.bat index 54fa2b2110d..c78daf6e3b1 100644 --- a/configure.bat +++ b/configure.bat @@ -103,7 +103,7 @@ goto doneargs cd "%TOPQTDIR%" rem Write config.opt if we're not currently -redo'ing -if "%rargs%" == "" ( +if "!rargs!" == "" ( echo %*>config.opt.in cmake -DIN_FILE=config.opt.in -DOUT_FILE=config.opt -DIGNORE_ARGS=-top-level -P "%QTSRC%\cmake\QtWriteArgsFile.cmake" )