diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-09 10:37:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 10:37:21 +0100 |
| commit | 28ec24473aca0aa0a6c84f7f7cf7e1e46cc17706 (patch) | |
| tree | 196b1897e5b17a08216a4181882349df739807a7 | |
| parent | cecc930e7897dec53a3449a9b6b9908aea351404 (diff) | |
| parent | 20b171cc5ae2482896ca6612d1db21e45b21576c (diff) | |
Merge pull request #46814 from akien-mga/scons-fix-env-creation
SCons: Propagate the user's OS environment in env["ENV"]
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 28257e1fde..1fec033881 100644 --- a/SConstruct +++ b/SConstruct @@ -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 |