Fix mismerge

[exim.git] / src / OS / Makefile-FreeBSD

diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD
index fef5609673c53d8ef3ef980abfa557c586df7887..5f01b84e695c121ef7c2337b7ebb7e3de156b5f0 100644 (file)
--- a/src/OS/Makefile-FreeBSD
+++ b/src/OS/Makefile-FreeBSD
@@ -1,12 +1,12 @@
 # Exim: OS-specific make file for FreeBSD
 # Exim: OS-specific make file for FreeBSD

-# There's no setting of CFLAGS here, to allow the system default
-# for "make" to be the default.
+#
+# Copyright (c) The Exim Maintainers 2020 - 2023
+# SPDX-License-Identifier: GPL-2.0-or-later

 
 CHOWN_COMMAND=/usr/sbin/chown
 
 CHOWN_COMMAND=/usr/sbin/chown

-STRIP_COMMAND=/usr/bin/strip
+#STRIP_COMMAND=/usr/bin/strip

 CHMOD_COMMAND=/bin/chmod
 
 CHMOD_COMMAND=/bin/chmod
 

-CFLAGS += -DTAINT_CHECK_SLOW

 
 # FreeBSD Ports no longer insert compatibility symlinks into /usr/bin for
 # scripting languages which traditionally have had them.
 
 # FreeBSD Ports no longer insert compatibility symlinks into /usr/bin for
 # scripting languages which traditionally have had them.


@@ -15,11 +15,14 @@ PERL_COMMAND=/usr/local/bin/perl
 HAVE_SA_LEN=YES
 
 # crypt() is in a separate library
 HAVE_SA_LEN=YES
 
 # crypt() is in a separate library

-LIBS=-lcrypt -lm -lutil
+LIBS=-lcrypt -lm -lutil -lexecinfo

 
 # Dynamically loaded modules need to be built with -fPIC
 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 
 
 # Dynamically loaded modules need to be built with -fPIC
 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 

+# Partial-linking needs -nostdlib
+LDFLAGS_PARTIAL=-nostdlib
+

 # FreeBSD always ships with Berkeley DB
 USE_DB=yes
 
 # FreeBSD always ships with Berkeley DB
 USE_DB=yes