[Python-checkins] bpo-40370: Use the same compile and link args as the interpreter used in test_peg_generator (GH-19674)
Pablo Galindo
webhook-mailer at python.org
Thu Apr 23 09:53:35 EDT 2020
https://github.com/python/cpython/commit/9e6a1312c1cd04ab37cddd8f3bb9baa7e9a38bc0
commit: 9e6a1312c1cd04ab37cddd8f3bb9baa7e9a38bc0
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-04-23T14:46:22+01:00
summary:
bpo-40370: Use the same compile and link args as the interpreter used in test_peg_generator (GH-19674)
files:
M Lib/test/test_peg_generator/test_c_parser.py
M Tools/peg_generator/pegen/build.py
diff --git a/Lib/test/test_peg_generator/test_c_parser.py b/Lib/test/test_peg_generator/test_c_parser.py
index 6682c907cda2a..ceda6d43d1750 100644
--- a/Lib/test/test_peg_generator/test_c_parser.py
+++ b/Lib/test/test_peg_generator/test_c_parser.py
@@ -8,6 +8,7 @@
from test import test_tools
from test.test_peg_generator.ast_dump import ast_dump
+from test import support
from pathlib import PurePath, Path
from typing import Sequence
@@ -23,6 +24,9 @@
class TestCParser(unittest.TestCase):
def setUp(self):
+ cmd = support.missing_compiler_executable()
+ if cmd is not None:
+ self.skipTest('The %r command is not found' % cmd)
self.tmp_path = tempfile.mkdtemp()
def tearDown(self):
diff --git a/Tools/peg_generator/pegen/build.py b/Tools/peg_generator/pegen/build.py
index bd792d66074ff..6ead94796f745 100644
--- a/Tools/peg_generator/pegen/build.py
+++ b/Tools/peg_generator/pegen/build.py
@@ -2,6 +2,7 @@
import shutil
import tokenize
import sys
+import sysconfig
from typing import Optional, Tuple
@@ -22,6 +23,14 @@
MOD_DIR = pathlib.Path(__file__).parent
+def get_extra_flags(compiler_flags, compiler_py_flags_nodist):
+ flags = sysconfig.get_config_var(compiler_flags)
+ py_flags_nodist = sysconfig.get_config_var(compiler_py_flags_nodist)
+ if flags is None or py_flags_nodist is None:
+ return []
+ return f'{flags} {py_flags_nodist}'.split()
+
+
def compile_c_extension(
generated_source_path: str,
build_dir: Optional[str] = None,
@@ -43,9 +52,8 @@ def compile_c_extension(
source_file_path = pathlib.Path(generated_source_path)
extension_name = source_file_path.stem
- extra_compile_args = []
- if not sys.platform.startswith('win'):
- extra_compile_args.append("-std=c99")
+ extra_compile_args = get_extra_flags('CFLAGS', 'PY_CFLAGS_NODIST')
+ extra_link_args = get_extra_flags('LDFLAGS', 'PY_LDFLAGS_NODIST')
if keep_asserts:
extra_compile_args.append("-UNDEBUG")
extension = [
@@ -66,6 +74,7 @@ def compile_c_extension(
str(MOD_DIR.parent.parent.parent / "Parser" / "pegen"),
],
extra_compile_args=extra_compile_args,
+ extra_link_args=extra_link_args,
)
]
dist = Distribution({"name": extension_name, "ext_modules": extension})
More information about the Python-checkins
mailing list