diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2022-12-06 15:31:46 +0100 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2022-12-08 12:21:26 +0000 |
| commit | 6bef53a81882b61308e987569f3254e8a4aa4775 (patch) | |
| tree | fa65e909c25fd390f236522099d17fe47a3da89a | |
| parent | deb454d8fbe24ca68a0c7024207537834fcecae8 (diff) | |
PE: Add ability to skip vcvarsall.bat /clean_env
By defining QTC_NO_MSVC_CLEAN_ENV one can skip the vcvarsall.bat /
clean_env functionality.
Task-number: QTCREATORBUG-28561
Change-Id: I6392b2278008607042a43a38a2c38669b4b52183
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 8a598c2624..468c408adf 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -2098,7 +2098,9 @@ std::optional<QString> MsvcToolChain::generateEnvironmentSettings(const Utils::E saver.write("set CLINK_NOAUTORUN=1\r\n"); saver.write("setlocal enableextensions\r\n"); saver.write("if defined VCINSTALLDIR (\r\n"); - saver.write(" call \"%VCINSTALLDIR%/Auxiliary/Build/vcvarsall.bat\" /clean_env\r\n"); + saver.write(" if not defined QTC_NO_MSVC_CLEAN_ENV (\r\n"); + saver.write(" call \"%VCINSTALLDIR%/Auxiliary/Build/vcvarsall.bat\" /clean_env\r\n"); + saver.write(" )\r\n"); saver.write(")\r\n"); saver.write(call + "\r\n"); saver.write("@echo " + marker.toLocal8Bit() + "\r\n"); |