From 1ce4734ab4749851da5b3b298d2a40684b9ce5e3 Mon Sep 17 00:00:00 2001 From: AlexPeshkoff Date: Thu, 8 Aug 2024 11:44:45 +0300 Subject: [PATCH] Try to fix build on linux/arm32 (attempt 3) --- builds/posix/make.defaults | 3 --- builds/posix/prefix.linux_arm | 1 - configure.ac | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults index 5a148a4424..3f32e80832 100755 --- a/builds/posix/make.defaults +++ b/builds/posix/make.defaults @@ -442,6 +442,3 @@ FIREBIRD_MSG = $(FIREBIRD)/firebird.msg # For want of a better suggestion we may as well default to posix PLATFORM_PATH = os/posix TRACE_OS_Sources = - -# Atomics -ATOMICLIB= diff --git a/builds/posix/prefix.linux_arm b/builds/posix/prefix.linux_arm index 0927e3e2d7..8e0b22205c 100644 --- a/builds/posix/prefix.linux_arm +++ b/builds/posix/prefix.linux_arm @@ -24,4 +24,3 @@ COMMON_FLAGS=-DLINUX -DARM -pipe -MMD -fPIC -fsigned-char -fmessage-length=0 -DF 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 0d55649bce..6c5cd25b31 100644 --- a/configure.ac +++ b/configure.ac @@ -320,6 +320,7 @@ dnl CPU_TYPE=ppc64 SHRLIB_EXT=so CPU_TYPE=arm32 STD_EDITLINE=true + ATOMICLIB=atomic ;; aarch64*-*-linux*)