From 68a740e25af964c7a4adc1dc0fb56c2c97057969 Mon Sep 17 00:00:00 2001 From: AlexPeshkoff Date: Thu, 8 Aug 2024 10:41:16 +0300 Subject: [PATCH] Try to fix build on linux/arm32 (attempt 2) --- builds/posix/make.defaults | 2 ++ builds/posix/prefix.linux_arm | 3 ++- configure.ac | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults index 7283d1fa4d..5a148a4424 100755 --- a/builds/posix/make.defaults +++ b/builds/posix/make.defaults @@ -443,3 +443,5 @@ FIREBIRD_MSG = $(FIREBIRD)/firebird.msg PLATFORM_PATH = os/posix TRACE_OS_Sources = +# Atomics +ATOMICLIB= diff --git a/builds/posix/prefix.linux_arm b/builds/posix/prefix.linux_arm index 197fc7c294..0927e3e2d7 100644 --- a/builds/posix/prefix.linux_arm +++ b/builds/posix/prefix.linux_arm @@ -20,7 +20,8 @@ #LD=@CXX@ -COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL -latomic +COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL PROD_FLAGS=$(COMMON_FLAGS) -O3 DEV_FLAGS=$(COMMON_FLAGS) -p -ggdb -Werror=delete-incomplete -Wall -Wno-non-virtual-dtor +ATOMICLIB=atomic diff --git a/configure.ac b/configure.ac index ea24eb826a..0d55649bce 100644 --- a/configure.ac +++ b/configure.ac @@ -1039,6 +1039,9 @@ dnl Check for libraries AC_SEARCH_LIBS(dlopen, dl) AC_CHECK_LIB(m, main) AC_SEARCH_LIBS(inet_aton, resolv) +if test "$ATOMICLIB"; then + AC_CHECK_LIB($ATOMICLIB, main) +fi dnl Check for libraries for static C++ runtime linking AC_CHECK_LIB(supc++, main, XE_APPEND(-lsupc++, STATIC_CXXSUPPORT_LIB))