9f2a2c1429
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2911 6952d904-891a-0410-993b-d76249ca496b
18 lines
761 B
Diff
18 lines
761 B
Diff
From: Nathan Phillip Brink <binki@gentoo.org>
|
|
Date: 2011/05/14
|
|
Subject: Don't assume that /usr/bin/python-config* is a python
|
|
script. Fixes build on portage-multilib where abi-wrapper is a
|
|
bash script wrapping around the different python-configs.
|
|
|
|
--- a/waflib/Tools/python.py
|
|
+++ b/waflib/Tools/python.py
|
|
@@ -169,7 +169,7 @@
|
|
conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
|
|
includes=[]
|
|
if conf.env.PYTHON_CONFIG:
|
|
- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
|
|
+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
|
|
if(incstr.startswith('-I')or incstr.startswith('/I')):
|
|
incstr=incstr[2:]
|
|
if incstr not in includes:
|