From 5d217a94414117438d92b094956baead8ec942fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 7 Mar 2021 22:27:14 +0100
Subject: [PATCH] SCons: Fix parsing PATH when constructing base environment

We constructed the SCons environment without taking any (shell) environment
variables into account, and then appended a few, but too late. This would
cause variables like `env[CXX]` not to be properly expanded to respect a
non-standard `PATH`.

With this fix, setting:
```
PATH=$GODOT_SDK/bin:$PATH
```
will now properly use `$GODOT_SDK/bin/gcc` if available over `/usr/bin/gcc`.
---
 SConstruct | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index f03fb72ff3..28257e1fde 100644
--- a/SConstruct
+++ b/SConstruct
@@ -61,11 +61,14 @@ elif platform_arg == "javascript":
     # Use generic POSIX build toolchain for Emscripten.
     custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
 
-env_base = Environment(tools=custom_tools)
-if "TERM" in os.environ:
-    env_base["ENV"]["TERM"] = os.environ["TERM"]
-env_base.AppendENVPath("PATH", os.getenv("PATH"))
-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
+env_base = Environment(
+    ENV={
+        "PATH": os.getenv("PATH"),
+        "PKG_CONFIG_PATH": os.getenv("PKG_CONFIG_PATH"),
+        "TERM": os.getenv("TERM"),
+    },
+    tools=custom_tools,
+)
 env_base.disabled_modules = []
 env_base.module_version_string = ""
 env_base.msvc = False