Skip to content

Commit

Permalink
SCons: Fix parsing PATH when constructing base environment
Browse files Browse the repository at this point in the history
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`.

(cherry picked from commit 5d217a9)
  • Loading branch information
akien-mga committed Mar 7, 2021
1 parent 8be3995 commit 6b48fce
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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.use_ptrcall = False
env_base.module_version_string = ""
Expand Down

0 comments on commit 6b48fce

Please sign in to comment.