1
0
mirror of https://github.com/godotengine/godot.git synced 2026-01-07 19:53:17 +00:00

Merge pull request #46814 from akien-mga/scons-fix-env-creation

SCons: Propagate the user's OS environment in env["ENV"]
This commit is contained in:
Rémi Verschelde
2021-03-09 10:37:21 +01:00
committed by GitHub

View File

@@ -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