From: Nikhil Benesch <nikhil.benesch@gmail.com>
Date: Wed, 22 Dec 2021 23:58:17 +0000 (-0500)
Subject: Remove unnecessary flag in macOS build
X-Git-Tag: krb5-1.20-beta1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1233%2Fhead;p=thirdparty%2Fkrb5.git

Remove unnecessary flag in macOS build

The configuration logic for adding the `-search_paths_first` linker
flag on Darwin does not correctly handle cross compilation.  It should
check the value of $krb5_cv_host rather than `uname -s` to detect when
the compilation target is Darwin, rather than the build machine.

It turns out `-search_paths_first` has been the default behavior of ld
on macOS since XCode 4.  So just remove that bit of logic entirely.
(The flag was added in commit acd27af0e845f8b93de2e226cc2ec9ac8af52077
in 2004; XCode 4 was released in 2010.)

[ghudson@mit.edu: edited commit message]
---

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 0ea4d18930..9920476f91 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -595,10 +595,6 @@ if test "$GCC" = yes ; then
       CFLAGS="$CFLAGS -fno-common"
       ;;
     esac
-    case "$LD $LDFLAGS" in
-    *-Wl,-search_paths_first*) ;;
-    *) LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" ;;
-    esac
   fi
 else
   if test "`uname -s`" = AIX ; then