From 3767f8153b6c1bf06e4eea9289af39fd4c08124f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sat, 3 Sep 2022 19:23:15 +0200 Subject: [PATCH 6/7] switch to C++17 for grpcio --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 4c06e38e95..6265b7c0ae 100644 --- a/setup.py +++ b/setup.py @@ -211,7 +211,7 @@ def check_linker_need_libatomic(): code_test = (b'#include \n' + b'int main() { return std::atomic{}; }') cxx = shlex.split(os.environ.get('CXX', 'c++')) - cpp_test = subprocess.Popen(cxx + ['-x', 'c++', '-std=c++14', '-'], + cpp_test = subprocess.Popen(cxx + ['-x', 'c++', '-std=c++17', '-'], stdin=PIPE, stdout=PIPE, stderr=PIPE) @@ -221,7 +221,7 @@ def check_linker_need_libatomic(): # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 cpp_test = subprocess.Popen( - [cxx, '-x', 'c++', '-std=c++14', '-', '-latomic'], + [cxx, '-x', 'c++', '-std=c++17', '-', '-latomic'], stdin=PIPE, stdout=PIPE, stderr=PIPE) @@ -239,7 +239,7 @@ def check_linker_need_libatomic(): EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None) EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None) if EXTRA_ENV_COMPILE_ARGS is None: - EXTRA_ENV_COMPILE_ARGS = ' -std=c++14' + EXTRA_ENV_COMPILE_ARGS = ' -std=c++17' if 'win32' in sys.platform: if sys.version_info < (3, 5): EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot' -- 2.37.0.windows.1