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