blob: 0c1d964a614c1884388162e06899c8177b3c2140 [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 Bishop316dfdd2018-06-25 12:45:53 -040021Index: grpcio-1.8.4/setup.py
22===================================================================
23--- grpcio-1.8.4.orig/setup.py
24+++ grpcio-1.8.4/setup.py
25@@ -115,7 +115,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
26 else:
27 EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028 elif "linux" in sys.platform:
29- EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
30+ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
31 elif "darwin" in sys.platform:
Brad Bishop316dfdd2018-06-25 12:45:53 -040032 EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
Brad Bishopd7bf8c12018-02-25 22:55:05 -050033