diff options
| author | Rene Engelhard <rene@debian.org> | 2019-08-30 21:00:55 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-09-03 10:41:12 +0200 |
| commit | 68fee5424f9c149aaabc44952b9a699367a66adf (patch) | |
| tree | b6468a0ad1a0551a8702032f08bf05f58f6d7a8c /configure.ac | |
| parent | assert on selecting text from end to start in shape with a11y enabled (diff) | |
| download | core-68fee5424f9c149aaabc44952b9a699367a66adf.tar.gz core-68fee5424f9c149aaabc44952b9a699367a66adf.zip | |
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>
(cherry picked from commit 098bf3b243bdbb3257fda97a54caa6c403f63df6)
Reviewed-on: https://gerrit.libreoffice.org/78412
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index c77ce67f332b..ce0698e845a9 100644 --- a/configure.ac +++ b/configure.ac @@ -6490,6 +6490,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 |