emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #111 from mrdomino/pkg-config-path

Browse source 
Fix compilation when PKG_CONFIG_PATH is not in environ
This commit is contained in:
Meredith L. Patterson 2014-12-30 00:18:25 +01:00
commit f78054708c
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -14,7 +14,11 @@ tools = ['default', 'scanreplace']
if 'dotnet' in ARGUMENTS.get('bindings', []): if 'dotnet' in ARGUMENTS.get('bindings', []):
tools.append('csharp/mono') tools.append('csharp/mono')
env = Environment(ENV = {'PATH' : os.environ['PATH'], 'PKG_CONFIG_PATH' : os.environ['PKG_CONFIG_PATH']}, envvars = {'PATH' : os.environ['PATH']}
if 'PKG_CONFIG_PATH' in os.environ:
envvars['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
env = Environment(ENV = envvars,
variables = vars, variables = vars,
tools=tools, tools=tools,
toolpath=['tools']) toolpath=['tools'])