Remove -std=gnu99 CFlag when compiling C++ with clang (#25778)

* Remove -std=gnu99 CFlag when compiling C++ with clang * Use endswith instead of hard-coded slices * Fix a typo
grpc · Apr 6, 2021 · 05ae3c5 · 05ae3c5
1 parent 03adef1
commit 05ae3c5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
@@ -258,10 +258,14 @@ def compiler_ok_with_extra_std():
             old_compile = self.compiler._compile
 
             def new_compile(obj, src, ext, cc_args, extra_postargs, pp_opts):
-                if src[-2:] == '.c':
+                if src.endswith('.c'):
                     extra_postargs = [
                         arg for arg in extra_postargs if not '-std=c++' in arg
                     ]
+                elif src.endswith('.cc') or src.endswith('.cpp'):
+                    extra_postargs = [
+                        arg for arg in extra_postargs if not '-std=gnu99' in arg
+                    ]
                 return old_compile(obj, src, ext, cc_args, extra_postargs,
                                    pp_opts)