[Groonga-commit] groonga/groonga at 8ea2729 [master] Disable -Wformat-nonliteral

Zurück zum Archiv-Index

Kouhei Sutou null+****@clear*****
Fri Jul 24 11:17:55 JST 2015


Kouhei Sutou	2015-07-24 11:17:55 +0900 (Fri, 24 Jul 2015)

  New Revision: 8ea2729dbbf943fc5b3865a5649042e1e5533142
  https://github.com/groonga/groonga/commit/8ea2729dbbf943fc5b3865a5649042e1e5533142

  Message:
    Disable -Wformat-nonliteral
    
    It reports false-positves for us.

  Modified files:
    CMakeLists.txt
    configure.ac
    vendor/mruby/Makefile.am

  Modified: CMakeLists.txt (+1 -1)
===================================================================
--- CMakeLists.txt    2015-07-24 11:10:19 +0900 (4f3de95)
+++ CMakeLists.txt    2015-07-24 11:17:55 +0900 (3d2513b)
@@ -176,7 +176,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
   check_build_flag("-Wno-sign-compare")
   check_cflag("-Wno-pointer-sign")
   check_build_flag("-Wno-missing-field-initializers")
-  check_build_flag("-Wformat=2")
+  check_build_flag("-Wformat")
   check_build_flag("-Wstrict-aliasing=2")
   check_build_flag("-fno-strict-aliasing")
   check_build_flag("-Wdisabled-optimization")

  Modified: configure.ac (+1 -7)
===================================================================
--- configure.ac    2015-07-24 11:10:19 +0900 (d0c37f5)
+++ configure.ac    2015-07-24 11:17:55 +0900 (92d1eb8)
@@ -143,7 +143,6 @@ TEST_CXXFLAGS=""
 NO_STRICT_ALIASING_CFLAGS=""
 NO_FLOAT_EQUAL_CFLAGS=""
 NO_BAD_FUNCTION_CAST_CFLAGS=""
-NO_FORMAT_NONLITERAL_CFLAGS=""
 if test "$GCC" = "yes"; then
   CHECK_BUILD_FLAG([-Wall])
   CHECK_BUILD_FLAG([-Wextra])
@@ -156,7 +155,7 @@ if test "$GCC" = "yes"; then
   CHECK_CFLAG([-Wno-pointer-sign])
   CHECK_BUILD_FLAG([-Wno-missing-field-initializers])
 
-  CHECK_BUILD_FLAG([-Wformat=2])
+  CHECK_BUILD_FLAG([-Wformat])
   CHECK_BUILD_FLAG([-Wstrict-aliasing=2])
   if test "x$check_cflag" = "xyes"; then
     NO_STRICT_ALIASING_CFLAGS="-fno-strict-aliasing"
@@ -171,10 +170,6 @@ if test "$GCC" = "yes"; then
   if test "x$check_cflag" = "xyes"; then
     NO_BAD_FUNCTION_CAST_CFLAGS="-Wno-bad-function-cast"
   fi
-  CHECK_CFLAG([-Wformat-nonliteral])
-  if test "x$check_cflag" = "xyes"; then
-    NO_FORMAT_NONLITERAL_CFLAGS="-Wno-format-nonliteral"
-  fi
   if test "$CLANG" = "no"; then
     CHECK_BUILD_FLAG([-Wcast-align])
   fi
@@ -207,7 +202,6 @@ AC_SUBST(TEST_CXXFLAGS)
 AC_SUBST(NO_STRICT_ALIASING_CFLAGS)
 AC_SUBST(NO_FLOAT_EQUAL_CFLAGS)
 AC_SUBST(NO_BAD_FUNCTION_CAST_CFLAGS)
-AC_SUBST(NO_FORMAT_NONLITERAL_CFLAGS)
 
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL

  Modified: vendor/mruby/Makefile.am (+1 -2)
===================================================================
--- vendor/mruby/Makefile.am    2015-07-24 11:10:19 +0900 (f472479)
+++ vendor/mruby/Makefile.am    2015-07-24 11:17:55 +0900 (764aa7e)
@@ -12,8 +12,7 @@ DEFAULT_INCLUDES =						\
 
 CFLAGS +=					\
 	$(NO_FLOAT_EQUAL_CFLAGS)		\
-	$(NO_BAD_FUNCTION_CAST_CFLAGS)		\
-	$(NO_FORMAT_NONLITERAL_CFLAGS)
+	$(NO_BAD_FUNCTION_CAST_CFLAGS)
 
 if WITH_MRUBY
 noinst_LTLIBRARIES = libmruby.la
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Zurück zum Archiv-Index