blob: 996597b146daaac73a92653b1d57c771f4bdb316 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 4 Aug 2017 09:04:07 -0700
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
10error: invalid argument '-std=gnu99' not allowed with 'C++'
11
12gcc7 ( defaults are -std=gnu11 and -std=gnu++14 )
13 as well clang default to these standards mode or newer
14anyway
15
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 setup.py | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080021Index: grpcio-1.14.1/setup.py
Brad Bishop316dfdd2018-06-25 12:45:53 -040022===================================================================
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080023--- grpcio-1.14.1.orig/setup.py
24+++ grpcio-1.14.1/setup.py
25@@ -123,7 +123,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.
26 EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None)
27 EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None)
28 if EXTRA_ENV_COMPILE_ARGS is None:
29- EXTRA_ENV_COMPILE_ARGS = ' -std=c++11'
30+ EXTRA_ENV_COMPILE_ARGS = ""
31 if 'win32' in sys.platform and sys.version_info < (3, 5):
32 EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot'
33 # We use define flags here and don't directly add to DEFINE_MACROS below to
34@@ -135,7 +135,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
Brad Bishop316dfdd2018-06-25 12:45:53 -040035 else:
36 EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050037 elif "linux" in sys.platform:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080038- EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050039+ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
40 elif "darwin" in sys.platform:
Brad Bishop316dfdd2018-06-25 12:45:53 -040041 EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080042 EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_16BIT'