Skip to content

Commit 86cb813

Browse files
committed
update libtool
1 parent 5a93d62 commit 86cb813

File tree

1 file changed

+19
-12
lines changed

1 file changed

+19
-12
lines changed

m4/libtool.m4

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;}
10411041
_LT_EOF
10421042
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
10431043
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
1044-
echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1045-
$AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
1044+
echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
1045+
$AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
10461046
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
10471047
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
10481048
cat > conftest.c << _LT_EOF
@@ -1071,11 +1071,11 @@ _LT_EOF
10711071
# to the OS version, if on x86, and 10.4, the deployment
10721072
# target defaults to 10.4. Don't you love it?
10731073
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
1074-
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
1074+
10.0,*86*-darwin8*|10.0,*-darwin[[912]]*)
10751075
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
10761076
10.[[012]][[,.]]*)
10771077
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
1078-
10.*)
1078+
10.*|11.*)
10791079
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
10801080
esac
10811081
;;
@@ -1492,7 +1492,7 @@ need_locks=$enable_libtool_lock
14921492
m4_defun([_LT_PROG_AR],
14931493
[AC_CHECK_TOOLS(AR, [ar], false)
14941494
: ${AR=ar}
1495-
: ${AR_FLAGS=cru}
1495+
: ${AR_FLAGS=cr}
14961496
_LT_DECL([], [AR], [1], [The archiver])
14971497
_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
14981498
@@ -4063,7 +4063,8 @@ _LT_EOF
40634063
if AC_TRY_EVAL(ac_compile); then
40644064
# Now try to grab the symbols.
40654065
nlist=conftest.nm
4066-
if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
4066+
$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
4067+
if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
40674068
# Try sorting and uniquifying the output.
40684069
if sort "$nlist" | uniq > "$nlist"T; then
40694070
mv -f "$nlist"T "$nlist"
@@ -4703,6 +4704,12 @@ m4_if([$1], [CXX], [
47034704
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
47044705
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
47054706
;;
4707+
# flang / f18. f95 an alias for gfortran or flang on Debian
4708+
flang* | f18* | f95*)
4709+
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4710+
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4711+
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4712+
;;
47064713
# icc used to be incompatible with GCC.
47074714
# ICC 10 doesn't accept -KPIC any more.
47084715
icc* | ifort*)
@@ -6438,7 +6445,7 @@ if test yes != "$_lt_caught_CXX_error"; then
64386445
# Commands to make compiler produce verbose output that lists
64396446
# what "hidden" libraries, object files and flags are used when
64406447
# linking a shared library.
6441-
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
6448+
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
64426449
64436450
else
64446451
GXX=no
@@ -6813,7 +6820,7 @@ if test yes != "$_lt_caught_CXX_error"; then
68136820
# explicitly linking system object files so we need to strip them
68146821
# from the output so that they don't get included in the library
68156822
# dependencies.
6816-
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
6823+
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
68176824
;;
68186825
*)
68196826
if test yes = "$GXX"; then
@@ -6878,7 +6885,7 @@ if test yes != "$_lt_caught_CXX_error"; then
68786885
# explicitly linking system object files so we need to strip them
68796886
# from the output so that they don't get included in the library
68806887
# dependencies.
6881-
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
6888+
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
68826889
;;
68836890
*)
68846891
if test yes = "$GXX"; then
@@ -7217,7 +7224,7 @@ if test yes != "$_lt_caught_CXX_error"; then
72177224
# Commands to make compiler produce verbose output that lists
72187225
# what "hidden" libraries, object files and flags are used when
72197226
# linking a shared library.
7220-
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
7227+
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
72217228
72227229
else
72237230
# FIXME: insert proper C++ library support
@@ -7301,7 +7308,7 @@ if test yes != "$_lt_caught_CXX_error"; then
73017308
# Commands to make compiler produce verbose output that lists
73027309
# what "hidden" libraries, object files and flags are used when
73037310
# linking a shared library.
7304-
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
7311+
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
73057312
else
73067313
# g++ 2.7 appears to require '-G' NOT '-shared' on this
73077314
# platform.
@@ -7312,7 +7319,7 @@ if test yes != "$_lt_caught_CXX_error"; then
73127319
# Commands to make compiler produce verbose output that lists
73137320
# what "hidden" libraries, object files and flags are used when
73147321
# linking a shared library.
7315-
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
7322+
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
73167323
fi
73177324
73187325
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

0 commit comments

Comments
 (0)