From 2ef8a85933f3ac36b289979ff9edd49dd12d0d16 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Aug 2017 09:04:07 -0700 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX so using -std=c++11 or -std=gnu99 together will cause build time errors espcially with clang error: invalid argument '-std=gnu99' not allowed with 'C++' gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) as well clang default to these standards mode or newer anyway Signed-off-by: Khem Raj 1. Keep '-std=c++11' and '-std=gnu99' to fix native build error with old gcc (such as gcc 5.4.0 on ubuntu 16.04), for clang we will remove them through GRPC_PYTHON_CFLAGS at do_compile in bb recipe. 2. While export CC="gcc ", cc_args is None, it will cause subprocess.Popen always return 1. On centos 8, if you don't install package libatomic, there will be a native build error `cannot find /usr/lib64/libatomic.so.1.2.0'. Add no harm '-g' to cc_args if cc_args is empty. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia --- setup.py | 6 +++++- src/python/grpcio/commands.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index e950057..1b68221 100644 --- a/setup.py +++ b/setup.py @@ -144,9 +144,13 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get( def check_linker_need_libatomic(): """Test if linker on system needs libatomic.""" + compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + if not cc_args: + cc_args = "-g" + code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') - cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'], + cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c++', '-std=c++11', '-'], stdin=PIPE, stdout=PIPE, stderr=PIPE) diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py index 064dda9..a75d8b9 100644 --- a/src/python/grpcio/commands.py +++ b/src/python/grpcio/commands.py @@ -216,7 +216,10 @@ class BuildExt(build_ext.build_ext): when invoked in C mode. GCC is okay with this, while clang is not. """ # TODO(lidiz) Remove the generated a.out for success tests. - cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++11', '-'], + compiler, cc_args = os.environ.get('CC').split(' ', 1) or 'gcc' + if not cc_args: + cc_args = "-g" + cc_test = subprocess.Popen([compiler, cc_args, '-x', 'c', '-std=c++11', '-'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) -- 2.7.4