blob: 3220a544d937fd717505f7d0e80fc329ae0b1469 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
commit 1f6bc557ec5c90eced96ae81ff1d443ee5770993
Author: Heiko Lewin <heiko.lewin@worldiety.de>
Date: Fri May 22 03:32:33 2020 +0200
configure: use LIBTOOL variable for Darwin builds
---
configure | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
--- a/configure
+++ b/configure
@@ -66,6 +66,12 @@
else
NM=${NM-"nm"}
fi
+if "${CROSS_PREFIX}libtool" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+ LIBTOOL=${LIBTOOL-"${CROSS_PREFIX}libtool"}
+ test -n "${CROSS_PREFIX}" && echo Using ${LIBTOOL} | tee -a configure.log
+else
+ LIBTOOL=${LIBTOOL-"libtool"}
+fi
# set defaults before processing command line options
LDCONFIG=${LDCONFIG-"ldconfig"}
@@ -241,8 +247,8 @@
SHAREDLIBV=libz.$VER$shared_ext
SHAREDLIBM=libz.$VER1$shared_ext
LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
- if libtool -V 2>&1 | grep Apple > /dev/null; then
- AR="libtool"
+ if ${LIBTOOL} -V 2>&1 | grep Apple > /dev/null; then
+ AR="${LIBTOOL}"
else
AR="/usr/bin/libtool"
fi
|
