mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
e16dbc4ca1
Refresh patch to apply cleanly Fix build for RISC-V Signed-off-by: Khem Raj <raj.khem@gmail.com>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From b02be74a2eff8abc612ef84f30e0fbce6a7f65f5 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Fri, 4 Aug 2017 09:04:07 -0700
|
|
Subject: [PATCH] setup.py: Do not mix C and C++ compiler options
|
|
|
|
EXTRA_ENV_COMPILE_ARGS is used both with CC and CXX
|
|
so using -std=c++11 or -std=gnu99 together will cause
|
|
build time errors espcially with clang
|
|
|
|
error: invalid argument '-std=gnu99' not allowed with 'C++'
|
|
|
|
gcc7 ( defaults are -std=gnu11 and -std=gnu++14 )
|
|
as well clang default to these standards mode or newer
|
|
anyway
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -145,7 +145,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.
|
|
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++11'
|
|
+ EXTRA_ENV_COMPILE_ARGS = ""
|
|
if 'win32' in sys.platform and sys.version_info < (3, 5):
|
|
EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot'
|
|
# We use define flags here and don't directly add to DEFINE_MACROS below to
|
|
@@ -157,7 +157,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
|
|
else:
|
|
EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64'
|
|
elif "linux" in sys.platform:
|
|
- EXTRA_ENV_COMPILE_ARGS += ' -std=gnu99 -fvisibility=hidden -fno-wrapv -fno-exceptions'
|
|
+ EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
|
|
elif "darwin" in sys.platform:
|
|
EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions'
|
|
EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT'
|