| Mike Frysinger | 4cfb44a | 2013-03-18 22:37:33 -0400 | [diff] [blame^] | 1 | use the host python when running the h2py code, and have that search sysroot |
| 2 | |
| 3 | --- a/Makefile.pre.in |
| 4 | +++ b/Makefile.pre.in |
| 5 | @@ -431,10 +431,10 @@ |
| 6 | $(srcdir)/Lib/$(PLATDIR): |
| 7 | mkdir $(srcdir)/Lib/$(PLATDIR) |
| 8 | cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen |
| 9 | - export PATH; PATH="`pwd`:$$PATH"; \ |
| 10 | + export INCLUDE="$(SYSROOT)$(INCLUDEDIR)"; \ |
| 11 | export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ |
| 12 | export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ |
| 13 | - export EXE; EXE="$(BUILDEXE)"; \ |
| 14 | + export HOSTPYTHON="`realpath $(HOSTPYTHON)`"; \ |
| 15 | cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen |
| 16 | |
| 17 | python-config: $(srcdir)/Misc/python-config.in |
| 18 | --- a/Tools/scripts/h2py.py |
| 19 | +++ b/Tools/scripts/h2py.py |
| 20 | @@ -60,6 +60,7 @@ except KeyError: |
| 21 | searchdirs=['/usr/include'] |
| 22 | |
| 23 | def main(): |
| 24 | + sysroot = os.getenv('SYSROOT', '') |
| 25 | global filedict |
| 26 | opts, args = getopt.getopt(sys.argv[1:], 'i:') |
| 27 | for o, a in opts: |
| 28 | @@ -72,7 +73,7 @@ def main(): |
| 29 | sys.stdout.write('# Generated by h2py from stdin\n') |
| 30 | process(sys.stdin, sys.stdout) |
| 31 | else: |
| 32 | - fp = open(filename, 'r') |
| 33 | + fp = open(sysroot + filename, 'r') |
| 34 | outfile = os.path.basename(filename) |
| 35 | i = outfile.rfind('.') |
| 36 | if i > 0: outfile = outfile[:i] |