summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2016-06-06 13:45:45 +0200
committerPedro J. Estébanez <pedrojrulez@gmail.com>2016-06-06 13:49:28 +0200
commitad0af9d2739f17c35be1dc78fab8049e96592cc4 (patch)
tree28e03db122afca0ab2af45aeafe387c1dbf261cf
parentf4ee46124a4b0926703b11ff11ee873be123b933 (diff)
Keep the default environment variables as set by SCons
-rw-r--r--SConstruct11
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=[]