[vlc-commits] [Git][videolan/vlc][master] configure: remove redundant -latomic test
Rémi Denis-Courmont (@Courmisch)
gitlab at videolan.org
Sat Feb 5 20:40:15 UTC 2022
Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
bae40c79 by Rémi Denis-Courmont at 2022-02-05T19:45:56+00:00
configure: remove redundant -latomic test
This was superseded by fc8208ec86db8eff4ec666a4c9af1828a9ac5bdf.
- - - - -
2 changed files:
- configure.ac
- src/Makefile.am
Changes:
=====================================
configure.ac
=====================================
@@ -70,30 +70,6 @@ AC_C_INLINE
AC_C_RESTRICT
AX_CXX_COMPILE_STDCXX_14([noext], [mandatory])
-dnl Check the compiler supports atomics in C
-AC_MSG_CHECKING([C atomics])
-VLC_SAVE_FLAGS
-ATOMIC_LIB=""
-AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdatomic.h>],[
- atomic_uintmax_t test;
- atomic_init(&test, 0);
- atomic_fetch_add_explicit(&test, 2u, memory_order_relaxed);
-])], [AC_MSG_RESULT([built-in])], [
- LDFLAGS="$LDFLAGS -latomic"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <stdatomic.h>],[
-atomic_uintmax_t test;
-atomic_init(&test, 0);
-atomic_fetch_add_explicit(&test, 2u, memory_order_relaxed);
-])],[
- AC_MSG_RESULT([using -latomic])
- ATOMIC_LIB="-latomic"
- ],[
- AC_MSG_ERROR([VLC requires atomics support])
- ])
-])
-VLC_RESTORE_FLAGS
-AC_SUBST([ATOMIC_LIB])
-
dnl Extend the --help string at the current spot.
AC_DEFUN([EXTEND_HELP_STRING], [m4_divert_once([HELP_ENABLE], [$1])])
=====================================
src/Makefile.am
=====================================
@@ -412,7 +412,7 @@ libvlccore_la_SOURCES = \
libvlccore_la_LIBADD = $(LIBS_libvlccore) \
../compat/libcompat.la \
$(LTLIBINTL) $(LTLIBICONV) \
- $(IDN_LIBS) $(SOCKET_LIBS) $(ATOMIC_LIB) $(LIBRT) $(LIBDL) $(LIBM)
+ $(IDN_LIBS) $(SOCKET_LIBS) $(LIBRT) $(LIBDL) $(LIBM)
libvlccore_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_libvlccore)
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/bae40c797da0701dabbd3bfde6db49d15dbf2f9f
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/bae40c797da0701dabbd3bfde6db49d15dbf2f9f
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list