blob: f17f048de8a1d28d660c207524f91e4167679d33 [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 Bishop19323692019-04-05 15:28:33 -040021--- a/setup.py
22+++ b/setup.py
23@@ -145,7 +145,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080024 EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None)
25 EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None)
26 if EXTRA_ENV_COMPILE_ARGS is None:
27- EXTRA_ENV_COMPILE_ARGS = ' -std=c++11'
28+ EXTRA_ENV_COMPILE_ARGS = ""
29 if 'win32' in sys.platform and sys.version_info < (3, 5):
30 EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot'
31 # We use define flags here and don't directly add to DEFINE_MACROS below to
Brad Bishop19323692019-04-05 15:28:33 -040032@@ -157,7 +157,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
Brad Bishop316dfdd2018-06-25 12:45:53 -040033 else:
34 EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050035 elif "linux" in sys.platform:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080036- EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050037+ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
38 elif "darwin" in sys.platform:
Brad Bishop316dfdd2018-06-25 12:45:53 -040039 EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
Brad Bishop19323692019-04-05 15:28:33 -040040 EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT'