1From de10fbc2386dcac3ab810c49b6977b2ee01bf426 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 17 Feb 2021 13:30:23 -0800
4Subject: [PATCH] setup.py: Do not mix C and C++ compiler options
5
6EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
7so using -std=c++11 or -std=gnu99 together will cause
8build time errors espcially with clang
9
10Keep '-std=c++11' to fix native build error
11with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang
12we will remove them through GRPC_PYTHON_CFLAGS at do_compile
13in bb recipe.
14
15While export CC="gcc ", cc_args is None, it will
16cause subprocess.Popen always return 1. On centos 8, if you don't
17install package libatomic, there will be a native build error
18`cannot find /usr/lib64/libatomic.so.1.2.0'.
19
20Add no harm '-g' to cc_args if cc_args is empty.
21
22Upstream-Status: Inappropriate [oe specific]
23
24Signed-off-by: Khem Raj <raj.khem@gmail.com>
25Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
26---
27 setup.py                      | 9 ++++++---
28 src/python/grpcio/commands.py | 5 ++++-
29 2 files changed, 10 insertions(+), 4 deletions(-)
30
31--- a/setup.py
32+++ b/setup.py
33@@ -199,8 +199,11 @@ def check_linker_need_libatomic():
34     """Test if linker on system needs libatomic."""
35     code_test = (b'#include <atomic>\n' +
36                  b'int main() { return std::atomic<int64_t>{}; }')
37-    cxx = os.environ.get('CXX', 'c++')
38-    cpp_test = subprocess.Popen([cxx, '-x', 'c++', '-std=c++11', '-'],
39+    cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++'
40+    if not cxx_args:
41+      cxx_args = "-g"
42+
43+    cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++11', '-'],
44                                 stdin=PIPE,
45                                 stdout=PIPE,
46                                 stderr=PIPE)
47@@ -210,7 +213,7 @@ def check_linker_need_libatomic():
48     # Double-check to see if -latomic actually can solve the problem.
49     # https://github.com/grpc/grpc/issues/22491
50     cpp_test = subprocess.Popen(
51-        [cxx, '-x', 'c++', '-std=c++11', '-', '-latomic'],
52+        [cxx, cxx_args, '-x', 'c++', '-std=c++11', '-', '-latomic'],
53         stdin=PIPE,
54         stdout=PIPE,
55         stderr=PIPE)
56--- a/src/python/grpcio/commands.py
57+++ b/src/python/grpcio/commands.py
58@@ -228,7 +228,10 @@ class BuildExt(build_ext.build_ext):
59             """
60             try:
61                 # TODO(lidiz) Remove the generated a.out for success tests.
62-                cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'],
63+                cc_test, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc'
64+                if not cc_args:
65+                    cc_args = "-g"
66+                cc_test = subprocess.Popen([cc_test, cc_args, '-x', 'c', '-std=c++11', '-'],
67                                            stdin=subprocess.PIPE,
68                                            stdout=subprocess.PIPE,
69                                            stderr=subprocess.PIPE)
70