Kouhei Sutou
null+****@clear*****
Sat Aug 11 18:56:15 JST 2018
Kouhei Sutou 2018-08-11 18:56:15 +0900 (Sat, 11 Aug 2018) New Revision: e1a7ce11f5a167b20c09a9d2b875e8b0b8bbfce3 https://github.com/mroonga/mroonga/commit/e1a7ce11f5a167b20c09a9d2b875e8b0b8bbfce3 Message: Enable templates Modified files: CMakeLists.txt configure.ac Modified: CMakeLists.txt (+3 -6) =================================================================== --- CMakeLists.txt 2018-08-10 18:40:23 +0900 (edfed001) +++ CMakeLists.txt 2018-08-11 18:56:15 +0900 (f25477cf) @@ -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}") Modified: configure.ac (+4 -4) =================================================================== --- configure.ac 2018-08-10 18:40:23 +0900 (926fd53b) +++ configure.ac 2018-08-11 18:56:15 +0900 (24d2c88c) @@ -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 -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180811/813b8acc/attachment-0001.htm
