From: Adam C. Emerson <aemerson@redhat.com>
Date: Thu, 28 Feb 2019 17:30:24 +0000 (-0500)
Subject: pybind: Fix Clang compilation under Fedora again
X-Git-Tag: v15.0.0~178^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8f63e6e497f04f56a21d9c19cc4e93d4ea826ee;p=ceph.git

pybind: Fix Clang compilation under Fedora again

Because the Fedora Python team treats this as a WONTFIX.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/pybind/cephfs/setup.py b/src/pybind/cephfs/setup.py
index 1f95005537c..7fbd2164e0f 100755
--- a/src/pybind/cephfs/setup.py
+++ b/src/pybind/cephfs/setup.py
@@ -18,7 +18,8 @@ clang = False
 def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
-                                         f.startswith('-fcf-protection'))]
+                                         f.startswith('-fcf-protection') or
+                                         f == '-fstack-clash-protection')]
     else:
         return flags
 
diff --git a/src/pybind/rados/setup.py b/src/pybind/rados/setup.py
index 75081df70e9..c9eaaf41bb2 100755
--- a/src/pybind/rados/setup.py
+++ b/src/pybind/rados/setup.py
@@ -26,7 +26,8 @@ clang = False
 def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
-                                         f.startswith('-fcf-protection'))]
+                                         f.startswith('-fcf-protection') or
+                                         f == '-fstack-clash-protection')]
     else:
         return flags
 
diff --git a/src/pybind/rbd/setup.py b/src/pybind/rbd/setup.py
index 8dd5c12a8ec..e6b4add49a7 100755
--- a/src/pybind/rbd/setup.py
+++ b/src/pybind/rbd/setup.py
@@ -18,7 +18,8 @@ clang = False
 def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
-                                         f.startswith('-fcf-protection'))]
+                                         f.startswith('-fcf-protection') or
+                                         f == '-fstack-clash-protection')]
     else:
         return flags
 
diff --git a/src/pybind/rgw/setup.py b/src/pybind/rgw/setup.py
index 4ee4f491ba5..8ec3a7a701f 100755
--- a/src/pybind/rgw/setup.py
+++ b/src/pybind/rgw/setup.py
@@ -18,7 +18,8 @@ clang = False
 def filter_unsupported_flags(flags):
     if clang:
         return [f for f in flags if not (f == '-mcet' or
-                                         f.startswith('-fcf-protection'))]
+                                         f.startswith('-fcf-protection') or
+                                         f == '-fstack-clash-protection')]
     return flags
 
 def monkey_with_compiler(compiler):