mirror of https://github.com/python/cpython.git
[Patch #442530 from twburton]
Provide include_dirs argument to all calls to ._preprocess and ._compile Fix typo: pattern.search(pattern) should be pattern.search(line)
This commit is contained in:
parent
e3eb1f2b23
commit
6fb8d3a3d6
|
@ -187,7 +187,7 @@ def try_cpp (self, body=None, headers=None, include_dirs=None, lang="c"):
|
|||
self._check_compiler()
|
||||
ok = 1
|
||||
try:
|
||||
self._preprocess(body, headers, lang)
|
||||
self._preprocess(body, headers, include_dirs, lang)
|
||||
except CompileError:
|
||||
ok = 0
|
||||
|
||||
|
@ -205,7 +205,7 @@ def search_cpp (self, pattern, body=None,
|
|||
"""
|
||||
|
||||
self._check_compiler()
|
||||
(src, out) = self._preprocess(body, headers, lang)
|
||||
(src, out) = self._preprocess(body, headers, include_dirs, lang)
|
||||
|
||||
if type(pattern) is StringType:
|
||||
pattern = re.compile(pattern)
|
||||
|
@ -216,7 +216,7 @@ def search_cpp (self, pattern, body=None,
|
|||
line = file.readline()
|
||||
if line == '':
|
||||
break
|
||||
if pattern.search(pattern):
|
||||
if pattern.search(line):
|
||||
match = 1
|
||||
break
|
||||
|
||||
|
@ -231,7 +231,7 @@ def try_compile (self, body, headers=None, include_dirs=None, lang="c"):
|
|||
from distutils.ccompiler import CompileError
|
||||
self._check_compiler()
|
||||
try:
|
||||
self._compile(body, headers, lang)
|
||||
self._compile(body, headers, include_dirs, lang)
|
||||
ok = 1
|
||||
except CompileError:
|
||||
ok = 0
|
||||
|
|
Loading…
Reference in New Issue