Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 4 Aug 2017 09:04:07 -0700 |
| 4 | Subject: [PATCH] setup.py: Do not mix C and C++ compiler options |
| 5 | |
| 6 | EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX |
| 7 | so using -std=c++11 or -std=gnu99 together will cause |
| 8 | build time errors espcially with clang |
| 9 | |
| 10 | error: invalid argument '-std=gnu99' not allowed with 'C++' |
| 11 | |
| 12 | gcc7 ( defaults are -std=gnu11 and -std=gnu++14 ) |
| 13 | as well clang default to these standards mode or newer |
| 14 | anyway |
| 15 | |
| 16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 17 | --- |
| 18 | setup.py | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 21 | --- a/setup.py |
| 22 | +++ b/setup.py |
| 23 | @@ -145,7 +145,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ. |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | 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 Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 32 | @@ -157,7 +157,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 33 | else: |
| 34 | EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64' |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 35 | elif "linux" in sys.platform: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 36 | - EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions' |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 37 | + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' |
| 38 | elif "darwin" in sys.platform: |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 39 | EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 40 | EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT' |