diff --git a/CMakeLists.txt b/CMakeLists.txt index 892c9b632..ce0ba9dd3 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,14 +56,23 @@ set(prefix_home $ENV{PREFIX_HOME}) set(CMAKE_INSTALL_PREFIX ${prefix_home} CACHE INTERNAL "") if("$ENV{GCC_VERSION}" STREQUAL "") execute_process(COMMAND gcc --version OUTPUT_VARIABLE GCC_VERSION_INFO OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REPLACE "\n" " " GCC_VERSION_INFO_TMP ${GCC_VERSION_INFO}) - string(REPLACE " " ";" GCC_VERSION_INFO_LIST ${GCC_VERSION_INFO_TMP}) - list(GET GCC_VERSION_INFO_LIST 2 GCC_VERSION) + string(REPLACE "\n" ";" GCC_VERSION_INFO_TMP ${GCC_VERSION_INFO}) + list(GET GCC_VERSION_INFO_TMP 0 GCC_VERSION_INFO_FIRSTLINE) + string(REPLACE " " ";" GCC_VERSION_INFO_LIST ${GCC_VERSION_INFO_FIRSTLINE}) + list(POP_BACK GCC_VERSION_INFO_LIST GCC_VERSION) else() set(GCC_VERSION $ENV{GCC_VERSION}) endif() +MESSAGE(STATUS "The current gcc version is: ${GCC_VERSION}") if("${GCC_VERSION}" STREQUAL "7.3.0") set(GCC_VERSION_LIT 7.3) + set(LIBSTD_SUB_VERSION 24) +elseif("${GCC_VERSION}" STREQUAL "10.3.1") + set(GCC_VERSION_LIT 10.3) + set(LIBSTD_SUB_VERSION 28) +elseif("${GCC_VERSION}" STREQUAL "10.3.0") + set(GCC_VERSION_LIT 10.3) + set(LIBSTD_SUB_VERSION 28) endif() if("$ENV{BUILD_TUPLE}" STREQUAL "") diff --git a/build/script/cmake_package_mini.sh b/build/script/cmake_package_mini.sh index 1f98032e2..42e73efb3 100644 --- a/build/script/cmake_package_mini.sh +++ b/build/script/cmake_package_mini.sh @@ -53,7 +53,7 @@ else fi show_package=false -gcc_version="7.3.0" +gcc_version="10.3.1" ##add platform architecture information cpus_num=$(grep -w processor /proc/cpuinfo|wc -l) @@ -269,9 +269,9 @@ done read_mpp_version -if [ "$gcc_version" = "7.3.0" ]; then +if [ "$gcc_version" == "7.3.0" ]; then gcc_version=${gcc_version:0:3} -elif [ "$gcc_version" = "10.3.0" ] || [ "$gcc_version" = "10.3.1" ]; then +elif [ "$gcc_version" == "10.3.0" ] || [ "$gcc_version" == "10.3.1" ]; then gcc_version=${gcc_version:0:4} else echo "Unknown gcc version $gcc_version" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bcb3a3779..2634d5281 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -242,7 +242,7 @@ endif() if("${ENABLE_MOT}" STREQUAL "ON") install(DIRECTORY ${MASSTREE_LIB_PATH} DESTINATION .) install(CODE "execute_process( - COMMAND cp ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libatomic.so.1.2.0 ${prefix_home}/lib/libatomic.so.1.2.0 + COMMAND cp ${GCC_LIB_PATH}/lib64/libatomic.so.1.2.0 ${prefix_home}/lib/libatomic.so.1.2.0 COMMAND ln -fs libatomic.so.1.2.0 libatomic.so COMMAND ln -fs libatomic.so.1.2.0 libatomic.so.1 WORKING_DIRECTORY ${prefix_home}/lib)" @@ -252,10 +252,10 @@ install(CODE "message(\"-- Created symlink: libatomic.so.1 -> libatomic.so.1.2.0 endif() install(FILES ${SECUREDYNAMICLIB_HOME}/libsecurec.so DESTINATION lib) -install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgcc_s.so.1 DESTINATION lib) -install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgomp.so DESTINATION lib) -install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgomp.so.1 DESTINATION lib) -install(FILES ${BUILDTOOLS_PATH}/gcc7.3/gcc/lib64/libgomp.so.1.0.0 DESTINATION lib) +install(FILES ${GCC_LIB_PATH}/lib64/libgcc_s.so.1 DESTINATION lib) +install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so DESTINATION lib) +install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so.1 DESTINATION lib) +install(FILES ${GCC_LIB_PATH}/lib64/libgomp.so.1.0.0 DESTINATION lib) install(FILES ${XGBOOST_LIB_PATH}/libxgboost.so DESTINATION lib) if(NOT "${ENABLE_LITE_MODE}" STREQUAL "ON") install(FILES ${PLJAVA_HOME}/lib/libpljava.so DESTINATION lib) @@ -279,7 +279,7 @@ install(DIRECTORY ${GCC_LIB_PATH}/lib64/ DESTINATION lib FILES_MATCHING PATTERN "libgomp.so*") install(CODE "execute_process( - COMMAND cp ${GCC_LIB_PATH}/lib64/libstdc++.so.6.0.24 ${prefix_home}/lib/libstdc++.so.6 + COMMAND cp ${GCC_LIB_PATH}/lib64/libstdc++.so.6.0.${LIBSTD_SUB_VERSION} ${prefix_home}/lib/libstdc++.so.6 WORKING_DIRECTORY ${prefix_home}/lib)" )