From 26c44be25333af131222219f2d52f91c752a86cb Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Fri, 30 Oct 2026 14:54:41 -0700
Subject: [PATCH 1/2] gh-145805: Change EMSDK_CACHE to PY_EMSDK_CACHE

Because Emscripten wants to own the environment variable EMSDK_CACHE.
Requires https://github.com/python/buildmaster-config/pull/826.
---
 Platforms/emscripten/__main__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platforms/emscripten/__main__.py b/Platforms/emscripten/__main__.py
index 84a1589b81f6a2..d28d93ce3bada9 100644
--- a/Platforms/emscripten/__main__.py
+++ b/Platforms/emscripten/__main__.py
@@ -812,12 +812,12 @@ def main():
         subcommand.add_argument(
             "--emsdk-cache",
             action="store",
-            default=os.environ.get("EMSDK_CACHE"),
+            default=os.environ.get("PY_EMSDK_CACHE"),
             dest="emsdk_cache",
             help=(
                 "Path to emsdk cache directory. If provided, validates that "
                 "the required emscripten version is installed. "
-                "Can also be set with the EMSDK_CACHE environment variable."
+                "Can also be set with the PY_EMSDK_CACHE environment variable."
             ),
         )
 

From 8edfd235747d28b753ea061dd959720138f71a81 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham@gmail.com>
Date: Fri, 30 Oct 2026 14:58:56 -0700
Subject: [PATCH 2/2] Update github action

---
 .github/workflows/reusable-emscripten.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/reusable-emscripten.yml b/.github/workflows/reusable-emscripten.yml
index f4fb5d4a5b0b6a..d093c86eb2db96 100644
--- a/.github/workflows/reusable-emscripten.yml
+++ b/.github/workflows/reusable-emscripten.yml
@@ -39,7 +39,7 @@ jobs:
             f.write(f"node-version={config['node-version']}\n")
             f.write(f"deps-hash={h.hexdigest()}\n")
         with open(os.environ["GITHUB_ENV"], "a") as f:
-            f.write(f"EMSDK_CACHE={emsdk_cache}\n")
+            f.write(f"PY_EMSDK_CACHE={emsdk_cache}\n")
     - name: "Install Node.js"
       uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
       with:
@@ -48,7 +48,7 @@ jobs:
       id: emsdk-cache
       uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
-        path: ${{ env.EMSDK_CACHE }}
+        path: ${{ env.PY_EMSDK_CACHE }}
         key: emsdk-${{ steps.emscripten-config.outputs.emscripten-version }}-${{ steps.emscripten-config.outputs.deps-hash }}
         restore-keys: emsdk-${{ steps.emscripten-config.outputs.emscripten-version }}
     - name: "Install Python"