Skip to content

Commit 68a740e

Browse files
committed
Try to fix build on linux/arm32 (attempt 2)
1 parent 4511be5 commit 68a740e

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

builds/posix/make.defaults

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,3 +443,5 @@ FIREBIRD_MSG = $(FIREBIRD)/firebird.msg
443443
PLATFORM_PATH = os/posix
444444
TRACE_OS_Sources =
445445

446+
# Atomics
447+
ATOMICLIB=

builds/posix/prefix.linux_arm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020

2121
#LD=@CXX@
2222

23-
COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL -latomic
23+
COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DFB_SEND_FLAGS=MSG_NOSIGNAL
2424

2525
PROD_FLAGS=$(COMMON_FLAGS) -O3
2626
DEV_FLAGS=$(COMMON_FLAGS) -p -ggdb -Werror=delete-incomplete -Wall -Wno-non-virtual-dtor
27+
ATOMICLIB=atomic

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,6 +1039,9 @@ dnl Check for libraries
10391039
AC_SEARCH_LIBS(dlopen, dl)
10401040
AC_CHECK_LIB(m, main)
10411041
AC_SEARCH_LIBS(inet_aton, resolv)
1042+
if test "$ATOMICLIB"; then
1043+
AC_CHECK_LIB($ATOMICLIB, main)
1044+
fi
10421045

10431046
dnl Check for libraries for static C++ runtime linking
10441047
AC_CHECK_LIB(supc++, main, XE_APPEND(-lsupc++, STATIC_CXXSUPPORT_LIB))

0 commit comments

Comments
 (0)