diff --git a/M2/configure.ac b/M2/configure.ac index 78f49f7e61e..e706099aaea 100644 --- a/M2/configure.ac +++ b/M2/configure.ac @@ -604,6 +604,21 @@ done AC_SUBST(OPENMP_CXXFLAGS,"$OPENMP_CXXFLAGS") AC_SUBST(OPENMP_LIBS,"$OPENMP_LIBS") +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 +AC_MSG_CHECKING([whether we need to link with -latomic]) +AC_LANG([C++]) +AC_LINK_IFELSE([AC_LANG_PROGRAM([ + #include + ], [std::atomic x; x++])], + [AC_MSG_RESULT([no])], + [LIBS="$LIBS -latomic" + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + #include + ], [std::atomic x; x++])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([error]) + AC_MSG_ERROR([unable to handle 64-bit atomics])])]) + ############################################################################# AC_SUBST(BUILTLIBS) # The list BUILTLIBS is the list of link options for the libraries we have decided to build, @@ -1850,21 +1865,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([int main() {}])], rm -f conftest.mapfile LDFLAGS=$SAVE -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358 -AC_MSG_CHECKING([whether we need to link with -latomic]) -AC_LANG([C++]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([ - #include - ], [std::atomic x; x++])], - [AC_MSG_RESULT([no])], - [LIBS="$LIBS -latomic" - AC_LINK_IFELSE([AC_LANG_PROGRAM([ - #include - ], [std::atomic x; x++])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([error]) - AC_MSG_ERROR([unable to handle 64-bit atomics])])]) - AC_SUBST(DUMPDATAFILE,Macaulay2-$ARCH-data) test "$MEMDEBUG" = yes && M2_CPPFLAGS="$M2_CPPFLAGS -DMEMDEBUG"