From 20b171cc5ae2482896ca6612d1db21e45b21576c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Tue, 9 Mar 2021 09:21:37 +0100
Subject: [PATCH] SCons: Propagate the user's OS environment in env["ENV"]

This fixes a regression from #46774 where `env["ENV"]` would miss some
important env variables on Windows, such as `SystemRoot`, `PATHEXT`, etc.

To have those, we can either use the default `ENV` created by SCons, or
propagate the whole external environment.

Fixes #46790.
---
 SConstruct | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/SConstruct b/SConstruct
index 28257e1fde6..1fec0338810 100644
--- a/SConstruct
+++ b/SConstruct
@@ -61,14 +61,9 @@ elif platform_arg == "javascript":
     # Use generic POSIX build toolchain for Emscripten.
     custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
 
-env_base = Environment(
-    ENV={
-        "PATH": os.getenv("PATH"),
-        "PKG_CONFIG_PATH": os.getenv("PKG_CONFIG_PATH"),
-        "TERM": os.getenv("TERM"),
-    },
-    tools=custom_tools,
-)
+# Construct the environment using the user's host env variables.
+env_base = Environment(ENV=os.environ, tools=custom_tools)
+
 env_base.disabled_modules = []
 env_base.module_version_string = ""
 env_base.msvc = False