firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Add gcc's libatomic only when needed (this fixes snapshot builds broken in the beginning of August)

Browse Source
This commit is contained in:
AlexPeshkoff 2018-09-23 16:14:04 +03:00
parent fded677e95
commit ab31df2699
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/posix/make.defaults
View File

@ -138,8 +138,6 @@ DECLIB=-ldecFloat$(CROSS)
# crypt library
CRYPTLIB=@CRYPTLIB@
ATOMICLIB=-latomic
LSB_FLG=@LSB_FLG@
ifeq ($(LSB_FLG), Y)
LSB_UNDEF=-Wl,--allow-shlib-undefined
@ -184,8 +182,8 @@ STATICLIB_LINK = $(AR) crus
EXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS)
STATICEXE_LINK = $(CXX) $(GLOB_OPTIONS) $(CXXFLAGS)
LINK_LIBS = @LIBS@ $(DECLIB) $(ATOMICLIB)
SO_LINK_LIBS = @LIBS@ $(DECLIB) $(ATOMICLIB)
LINK_LIBS = @LIBS@ $(DECLIB)
SO_LINK_LIBS = @LIBS@ $(DECLIB)
# Default extensions

2
configure.ac
View File

@ -872,7 +872,7 @@ if test "$EDITLINE_FLG" = "Y"; then
fi
AC_SEARCH_LIBS(inet_aton, resolv)
AC_CHECK_LIB(atomic, main)
dnl Check for libraries for static C++ runtime linking
AC_CHECK_LIB(supc++, main, XE_APPEND(-lsupc++, STATIC_CXXSUPPORT_LIB))