Only write cmake_cmd_line.txt cache file if cmake succeeded (#93673)

akoeplinger · web-flow · commit d65a39d659e1 · 2023-10-18T20:04:23.000+02:00
I noticed that we wrote the cache file before invoking cmake, this meant that if the cmake configure step failed (e.g. because of an invalid command like in #93670) then running the build again would skip cmake configure, resulting in a broken build setup. This only applies to non-VS generators like ninja.
diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd
@@ -101,10 +101,7 @@ if not "%__ConfigureOnly%" == "1" (
                 exit /B 0
             ) else (
                 echo The CMake command line differs from the last run. Running CMake again.
-                echo %__ExtraCmakeParams% > %__CmdLineOptionsUpToDateFile%
             )
-        ) else (
-            echo %__ExtraCmakeParams% > %__CmdLineOptionsUpToDateFile%
         )
     )
 )
@@ -114,6 +111,11 @@ if /i "%__UseEmcmake%" == "1" (
 ) else (
     "%CMakePath%" %__ExtraCmakeParams% --no-warn-unused-cli -G "%__CmakeGenerator%" -B %__IntermediatesDir% -S %__SourceDir%
 )
+
+if "%errorlevel%" == "0" (
+    echo %__ExtraCmakeParams% > %__CmdLineOptionsUpToDateFile%
+)
+
 endlocal
 exit /B %errorlevel%
 

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,7 @@ if not "%__ConfigureOnly%" == "1" (`
`101`	`101`	`exit /B 0`
`102`	`102`	`) else (`
`103`	`103`	`echo The CMake command line differs from the last run. Running CMake again.`
`104`		`- echo %__ExtraCmakeParams% > %__CmdLineOptionsUpToDateFile%`
`105`	`104`	`)`
`106`		`- ) else (`
`107`		`- echo %__ExtraCmakeParams% > %__CmdLineOptionsUpToDateFile%`
`108`	`105`	`)`
`109`	`106`	`)`
`110`	`107`	`)`
`@@ -114,6 +111,11 @@ if /i "%__UseEmcmake%" == "1" (`
`114`	`111`	`) else (`
`115`	`112`	`"%CMakePath%" %__ExtraCmakeParams% --no-warn-unused-cli -G "%__CmakeGenerator%" -B %__IntermediatesDir% -S %__SourceDir%`
`116`	`113`	`)`
	`114`	`+`
	`115`	`+if "%errorlevel%" == "0" (`
	`116`	`+ echo %__ExtraCmakeParams% > %__CmdLineOptionsUpToDateFile%`
	`117`	`+)`
	`118`	`+`
`117`	`119`	`endlocal`
`118`	`120`	`exit /B %errorlevel%`
`119`	`121`