From: Michael Roitzsch <reactorcontrol@icloud.com>
Date: Wed, 20 Feb 2019 04:17:40 +0000 (+1030)
Subject: Use or1k-darwin host SHARED_LIBADD for *-darwin.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edd01d077c5f7a0f76ec4fb77b5b9f5b151fa50a;p=binutils-gdb.git

Use or1k-darwin host SHARED_LIBADD for *-darwin.

	* configure.ac (SHARED_LIBADD): Add -liberty -lintl for all
	Darwin hosts, not just or1k.
	* configure: Regenerate.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e39bb1264cb..bb73a972759 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-20  Michael Roitzsch  <reactorcontrol@icloud.com>
+
+	* configure.ac (SHARED_LIBADD): Add -liberty -lintl for all
+	Darwin hosts, not just or1k.
+	* configure: Regenerate.
+
 2019-02-20  Alan Modra  <amodra@gmail.com>
 
 	PR 24236
diff --git a/bfd/configure b/bfd/configure
index 66901c018fc..8d6c94aef2e 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -14528,15 +14528,15 @@ if test "$enable_shared" = "yes"; then
     SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
   fi
 
-# More hacks to build DLLs on Windows.
   case "${host}" in
+  # More hacks to build DLLs on Windows.
   *-*-cygwin*)
     SHARED_LDFLAGS="-no-undefined"
     SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
   ;;
 
-  # Hack to build or1k-src on OSX
-  or1k*-*-darwin*)
+  # Use built-in libintl on macOS, since it is not provided by libc.
+  *-*-darwin*)
     SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl"
   ;;
   esac
diff --git a/bfd/configure.ac b/bfd/configure.ac
index eda38ea086b..5f02c41520e 100644
--- a/bfd/configure.ac
+++ b/bfd/configure.ac
@@ -296,15 +296,15 @@ changequote([,])dnl
     SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
   fi
 
-# More hacks to build DLLs on Windows.
   case "${host}" in
+  # More hacks to build DLLs on Windows.
   *-*-cygwin*)
     SHARED_LDFLAGS="-no-undefined"
     SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
   ;;
 
-  # Hack to build or1k-src on OSX
-  or1k*-*-darwin*)
+  # Use built-in libintl on macOS, since it is not provided by libc.
+  *-*-darwin*)
     SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl"
   ;;
   esac