blob: 99d0c181d2af8f02cd2ff978b22a85a58ce6e29a [file] [log] [blame]
Mike Frysinger4cfb44a2013-03-18 22:37:33 -04001use the host python when running the h2py code, and have that search sysroot
2
Cheng-Yi Chiangb88f6962015-08-06 13:49:23 +00003--- a/Makefile.pre.in
4+++ b/Makefile.pre.in
Mike Frysinger51f0d522015-11-21 00:11:17 +00005@@ -1082,10 +1082,10 @@
Cheng-Yi Chiangb88f6962015-08-06 13:49:23 +00006 $(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)"; \
Mike Frysinger51f0d522015-11-21 00:11:17 +000011 export PYTHONPATH; PYTHONPATH="$(srcdir)/Lib:$(abs_builddir)/`cat pybuilddir.txt`"; \
Cheng-Yi Chiangb88f6962015-08-06 13:49:23 +000012 export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
13- export EXE; EXE="$(BUILDEXE)"; \
14+ export HOSTPYTHON="`realpath $(HOSTPYTHON)`"; \
Mike Frysinger51f0d522015-11-21 00:11:17 +000015 if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
16 export PYTHON_FOR_BUILD; \
17 if [ "$(build)" = "$(host)" ]; then \
Mike Frysinger4cfb44a2013-03-18 22:37:33 -040018--- 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]