Merge pull request #4179 from Adjective-Object/master
inherit PKG_CONFIG_PATH from environment
This commit is contained in:
commit
8708a284f7
|
@ -63,7 +63,12 @@ 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.environ['PATH']});
|
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.global_defaults=global_defaults
|
env_base.global_defaults=global_defaults
|
||||||
|
|
Loading…
Reference in New Issue