Kaydet (Commit) 8301256a authored tarafından Martin v. Löwis's avatar Martin v. Löwis

Compute expat -I directives from srcdir. Fixes #517214.

üst b012a15c
...@@ -224,6 +224,7 @@ class PyBuildExt(build_ext): ...@@ -224,6 +224,7 @@ class PyBuildExt(build_ext):
exts = [] exts = []
platform = self.get_platform() platform = self.get_platform()
(srcdir,) = sysconfig.get_config_vars('srcdir')
# Check for MacOS X, which doesn't need libm.a at all # Check for MacOS X, which doesn't need libm.a at all
math_libs = ['m'] math_libs = ['m']
...@@ -558,6 +559,7 @@ class PyBuildExt(build_ext): ...@@ -558,6 +559,7 @@ class PyBuildExt(build_ext):
xmlbo = "12" xmlbo = "12"
else: else:
xmlbo = "21" xmlbo = "21"
expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
exts.append(Extension('pyexpat', exts.append(Extension('pyexpat',
sources = [ sources = [
'pyexpat.c', 'pyexpat.c',
...@@ -572,7 +574,7 @@ class PyBuildExt(build_ext): ...@@ -572,7 +574,7 @@ class PyBuildExt(build_ext):
('XML_BYTE_ORDER', xmlbo), ('XML_BYTE_ORDER', xmlbo),
('XML_CONTEXT_BYTES','1024'), ('XML_CONTEXT_BYTES','1024'),
], ],
include_dirs = ['Modules/expat'] include_dirs = [expatinc]
)) ))
# Dynamic loading module # Dynamic loading module
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment