From 73e455c22fd71434963f5479cbd702f2f889be8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Mon, 6 Jun 2016 13:45:45 +0200 Subject: [PATCH] Keep the default environment variables as set by SCons (cherry picked from commit ad0af9d2739f17c35be1dc78fab8049e96592cc4) --- SConstruct | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 5e821751f3b..0f9b046e2bd 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=[]