X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_harden_compiler_flags.m4;h=8ceeca67a52f48d263367c8458e37b32eefadd25;hb=22da6f6d6410053ac1f4682453b52463e6c9a05f;hp=3ab549388e813cc364e2bf2c672efd9b4656a9d4;hpb=879ce2d055d3c4ebdbfa50e26877ee5948b04365;p=awesomized%2Flibmemcached

diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index 3ab54938..8ceeca67 100644
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -73,14 +73,17 @@ AC_DEFUN([_SET_SANITIZE_FLAGS],
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=float-divide-by-zero])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=integer-divide-by-zero])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=null])
-                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=return])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=shift])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=signed-integer-overflow])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unreachable])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=unsigned-integer-overflow])
                                _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vla-bound])
-                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])])
+                               _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=vptr])
+                               AS_IF([test "$ax_cv_c_compiler_vendor" != "clang"],[
+                                 _APPEND_COMPILE_FLAGS_ERROR([-fsanitize=object-size])
+                               ])
+                               ])
                       ])
                 ])
           ])
@@ -201,7 +204,7 @@ AC_DEFUN([_HARDEN_CC_COMPILER_FLAGS],
           _APPEND_COMPILE_FLAGS_ERROR([-Wsizeof-pointer-memaccess])
           _APPEND_COMPILE_FLAGS_ERROR([-Wpacked])
           _APPEND_COMPILE_FLAGS_ERROR([-Wlong-long])
-          _APPEND_COMPILE_FLAGS_ERROR([ftrapv])
+          _APPEND_COMPILE_FLAGS_ERROR([-ftrapv])
           # Stop error when using -pie on library builds
           _APPEND_COMPILE_FLAGS_ERROR([-Wno-unused-command-line-argument])
 #         GCC 4.5 removed this.