Skip to content

Commit

Permalink
pythongh-105776: Fix test_cppext when CC contains -std=c11 option (py…
Browse files Browse the repository at this point in the history
…thon#108343)

Fix test_cppext when the C compiler command has the "-std=c11" option.
Remove "-std=" options from the compiler command.

(cherry picked from commit 9173b2b)
  • Loading branch information
vstinner committed Aug 23, 2023
1 parent a153961 commit 75cdf3d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
13 changes: 13 additions & 0 deletions Lib/test/test_cppext/setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# gh-91321: Build a basic C++ test extension to check that the Python C API is
# compatible with C++ and does not emit C++ compiler warnings.
import os.path
import shlex
import sys
import sysconfig

from setuptools import setup, Extension

Expand Down Expand Up @@ -36,6 +38,17 @@ def main():

cppflags = [*CPPFLAGS, f'-std={std}']

# gh-105776: When "gcc -std=11" is used as the C++ compiler, -std=c11
# option emits a C++ compiler warning. Remove "-std11" option from the
# CC command.
cmd = (sysconfig.get_config_var('CC') or '')
if cmd is not None:
cmd = shlex.split(cmd)
cmd = [arg for arg in cmd if not arg.startswith('-std=')]
cmd = shlex.join(cmd)
# CC env var overrides sysconfig CC variable in setuptools
os.environ['CC'] = cmd

cpp_ext = Extension(
name,
sources=[SOURCE],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix test_cppext when the C compiler command ``-std=c11`` option: remove
``-std=`` options from the compiler command. Patch by Victor Stinner.

0 comments on commit 75cdf3d

Please sign in to comment.