From b1382ac9f278ded0e4c46fcacd4395782db92e81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Desgroppes?= <rdesgroppes@gmail.com>
Date: Thu, 16 Apr 2026 14:27:39 +0200
Subject: [PATCH] gh-148644: propagate PGO job exit code in PCbuild/build.bat

Replace the `if "%clean%"=="false" (...)` block with a `goto :RunPgoJob`
so the job runs outside any parenthesized block, where `%ERRORLEVEL%` is
not subject to eager evaluation.

Save the exit code before `call :Kill` resets it, then propagate it if
non-zero.
---
 PCbuild/build.bat | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 8fb2f096c93c0e..9d2f032f5a9355 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -170,16 +170,20 @@ if "%do_pgo%"=="true" (
     del /s "%dir%\*.pgc"
     del /s "%dir%\..\Lib\*.pyc"
     set conf=PGUpdate
-    if "%clean%"=="false" (
-        echo on
-        call "%dir%\..\python.bat" %pgo_job%
-        @echo off
-        call :Kill
-        set target=Build
-    )
+    if "%clean%"=="false" goto :RunPgoJob
 )
 goto :Build
 
+:RunPgoJob
+echo on
+call "%dir%\..\python.bat" %pgo_job%
+@echo off
+set pgo_errorlevel=%ERRORLEVEL%
+call :Kill
+if %pgo_errorlevel% NEQ 0 exit /B %pgo_errorlevel%
+set target=Build
+goto :Build
+
 :Kill
 echo on
 %MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^