summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorRene Engelhard <rene@debian.org>2019-08-30 21:00:55 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-09-02 19:11:38 +0200
commit098bf3b243bdbb3257fda97a54caa6c403f63df6 (patch)
tree9321a240ffac932b7dcde6732549a80e98dd4d3d /configure.ac
parentae5fc99491cf61b02b8dc1c666c88435beadf3e5 (diff)
add -latomic configure check...
...in preparation for <https://gerrit.libreoffice.org/#/c/78380/> "Add -latomic to the end of Linux C++ linker command lines" (copied from https://github.com/zelcash/zelcash/blob/master/build-aux/m4/l_atomic.m4) Change-Id: I8879a72d730cc08a72c2d8b132ff9f5d2efe7b9f Reviewed-on: https://gerrit.libreoffice.org/78336 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 41d64890d01c..658abe24081a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6537,6 +6537,14 @@ else
fi
AC_SUBST(CXXFLAGS_CXX11)
+if test "$GCC" = "yes"; then
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11"
+ CHECK_L_ATOMIC
+ CXXFLAGS=$save_CXXFLAGS
+ AC_SUBST(ATOMIC_LIB)
+fi
+
dnl Test for temporarily incompatible libstdc++ 4.7.{0,1}, where
dnl <https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=179528> introduced
dnl an additional member _M_size into C++11 std::list towards 4.7.0 and