diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-07 22:50:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 22:50:52 +0100 |
| commit | 7739db379944d7479c5ea2ebad9a78e3bf33fc6f (patch) | |
| tree | 4227a1a111a54a5b9bb916fc0e0d0645feca0047 | |
| parent | 1e59443cd242cae1ba556803a258a30b29a2b407 (diff) | |
| parent | 5d217a94414117438d92b094956baead8ec942fb (diff) | |
Merge pull request #46774 from akien-mga/scons-respect-path
SCons: Fix parsing PATH when constructing base environment
| -rw-r--r-- | SConstruct | 13 |
1 files 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 |