瀏覽代碼

Keep the default environment variables as set by SCons

Pedro J. Estébanez 9 年之前
父節點
當前提交
ad0af9d273
共有 1 個文件被更改,包括 3 次插入8 次删除
  1. 3 8
      SConstruct

+ 3 - 8
SConstruct

@@ -63,14 +63,9 @@ elif (os.name=="nt"):
 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
 		custom_tools=['mingw']
 		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.global_defaults=global_defaults
 env_base.android_maven_repos=[]
 env_base.android_maven_repos=[]
 env_base.android_dependencies=[]
 env_base.android_dependencies=[]