diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2021-03-07 22:27:14 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2021-03-07 22:28:46 +0100 |
| commit | 5d217a94414117438d92b094956baead8ec942fb (patch) | |
| tree | e9c7b06593d683284e9c47d19664f892237532d4 | |
| parent | 27aacabf81f41a05f1269c868e5831861e2a1442 (diff) | |
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`.
| -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 |