diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-06 23:27:08 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-06-06 23:27:08 +0200 |
| commit | 7dd00d3398acc06fc2d7517304f2c85365df67ea (patch) | |
| tree | e454e7a4dbc0d20f16accc25d2698916c3cb811b | |
| parent | 1ce0ccac29fd6ad7d3c0c404cc135633a00c2d40 (diff) | |
| parent | ad0af9d2739f17c35be1dc78fab8049e96592cc4 (diff) | |
Merge pull request #5065 from RandomShaper/keep-default-build-env
Keep the default environment variables as set by SCons
| -rw-r--r-- | SConstruct | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index 5e821751f3..0f9b046e2b 100644 --- a/SConstruct +++ b/SConstruct @@ -63,14 +63,9 @@ elif (os.name=="nt"): if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"): custom_tools=['mingw'] -env_base=Environment( - tools=custom_tools, - ENV={ - 'PATH' : os.getenv('PATH'), - 'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH') -}); - -#env_base=Environment(tools=custom_tools); +env_base=Environment(tools=custom_tools); +env_base.AppendENVPath('PATH', os.getenv('PATH')) +env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH')) env_base.global_defaults=global_defaults env_base.android_maven_repos=[] env_base.android_dependencies=[] |