Merge PR ceph#33056 into master

* refs/pull/33056/head: common: fix clang compile errors from cython_modules Reviewed-by: Ronen Friedman <[email protected]> Reviewed-by: Kefu Chai <[email protected]>
david-caro · Feb 5, 2020 · e7b7e2e · e7b7e2e
2 parents 572425e + b460173
commit e7b7e2e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/.githubmap b/.githubmap
@@ -113,3 +113,4 @@ bk201 Kiefer Chang <[email protected]>
 alimaredia Ali Maredia <[email protected]>
 ideepika Deepika Upadhyay <[email protected]>
 p-se Patrick Seidensal <[email protected]>
+ronen-fr Ronen Friedman <[email protected]>
diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
@@ -19,7 +19,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     else:
         return flags
 
@@ -55,7 +58,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))
 

diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
@@ -27,7 +27,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     else:
         return flags
 
@@ -55,7 +58,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))
 

diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
@@ -19,7 +19,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     else:
         return flags
 
@@ -55,7 +58,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))
 

diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
@@ -19,7 +19,10 @@ def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
                                          f.startswith('-fcf-protection') or
-                                         f == '-fstack-clash-protection')]
+                                         f == '-fstack-clash-protection' or
+                                         f == '-fno-var-tracking-assignments' or
+                                         f == '-Wno-deprecated-register' or
+                                         f == '-Wno-gnu-designator')]
     return flags
 
 def monkey_with_compiler(compiler):
@@ -58,7 +61,7 @@ def get_python_flags(libs):
         include_dirs=[distutils.sysconfig.get_python_inc()],
         library_dirs=distutils.sysconfig.get_config_vars('LIBDIR', 'LIBPL'),
         libraries=libs + [lib.replace('-l', '') for lib in py_libs],
-        extra_compile_args=distutils.sysconfig.get_config_var('CFLAGS').split(),
+        extra_compile_args=filter_unsupported_flags(distutils.sysconfig.get_config_var('CFLAGS').split()),
         extra_link_args=(distutils.sysconfig.get_config_var('LDFLAGS').split() +
                          distutils.sysconfig.get_config_var('LINKFORSHARED').split()))