Merge pull request #5065 from RandomShaper/keep-default-build-env
Keep the default environment variables as set by SCons
This commit is contained in:
commit
7dd00d3398
1 changed files with 3 additions and 8 deletions
11
SConstruct
11
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(
|
env_base=Environment(tools=custom_tools);
|
||||||
tools=custom_tools,
|
env_base.AppendENVPath('PATH', os.getenv('PATH'))
|
||||||
ENV={
|
env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
|
||||||
'PATH' : os.getenv('PATH'),
|
|
||||||
'PKG_CONFIG_PATH' : os.getenv('PKG_CONFIG_PATH')
|
|
||||||
});
|
|
||||||
|
|
||||||
#env_base=Environment(tools=custom_tools);
|
|
||||||
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=[]
|
||||||
|
|
Loading…
Reference in a new issue