Enable templates

mroonga · Aug 11, 2018 · e1a7ce1 · e1a7ce1
1 parent d717f03
commit e1a7ce1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -383,14 +383,11 @@ else()
     mrn_build_flag("-Wno-unused-parameter")
     mrn_build_flag("-Wno-strict-aliasing")
     mrn_build_flag("-Wno-deprecated")
-    mrn_check_cxxflag("-fno-implicit-templates")
-    if(("${MYSQL_VARIANT}" STREQUAL "MariaDB") OR
-        ("${MYSQL_VARIANT}" STREQUAL "MySQL" AND
-         ${MYSQL_VERSION} VERSION_LESS "5.7.0"))
-      mrn_check_cxxflag("-fno-exceptions")
+    mrn_check_cxxflag("-felide-constructors")
+    if("${MYSQL_VARIANT}" STREQUAL "MariaDB" AND
+        ${MYSQL_VERSION} VERSION_LESS "10.1.0")
       mrn_check_cxxflag("-fno-rtti")
     endif()
-    mrn_check_cxxflag("-felide-constructors")
   endif()
   set_source_files_properties(${MRN_SOURCES} PROPERTIES
     COMPILE_FLAGS "${MYSQL_CFLAGS} ${MRN_CXX_COMPILE_FLAGS}")

diff --git a/configure.ac b/configure.ac
@@ -207,13 +207,13 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
 
   MYSQL_MAJOR_MINOR_VERSION=["$(echo $MYSQL_VERSION | sed -e 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*[a-z]*\)[.0-9a-z-]*$/\1.\2/')"]
 
-  MYSQL_CXXFLAGS="-fno-implicit-templates -felide-constructors"
+  MYSQL_CXXFLAGS="-felide-constructors"
   case "$MYSQL_MAJOR_MINOR_VERSION" in
-  5.7|8.*)
-      :
+  5.5|10.0)
+      MYSQL_CXXFLAGS="$MYSQL_CXXFLAGS -fno-rtti"
       ;;
   *)
-      MYSQL_CXXFLAGS="$MYSQL_CXXFLAGS -fno-exceptions -fno-rtti"
+      :
       ;;
   esac