[ci] Update macos jobs
[xapian.git] / patches / libtool / msvc-support-tweaks.patch
blob00650634c2a7ea67d010e244bd6e1a42469d3452
1 diff -ru a/build-aux/compile b/build-aux/compile
2 --- a/build-aux/compile 2015-01-17 07:32:31.000000000 +1300
3 +++ b/build-aux/compile 2017-10-22 11:21:34.725960435 +1300
4 @@ -143,7 +143,7 @@
5 # configure might choose to run compile as 'compile cc -o foo foo.c'.
6 eat=1
7 case $2 in
8 - *.o | *.[oO][bB][jJ])
9 + *.o | *.lo | *.[oO][bB][jJ])
10 func_file_conv "$2"
11 set x "$@" -Fo"$file"
12 shift
13 diff -ru a/m4/libtool.m4 b/m4/libtool.m4
14 --- a/m4/libtool.m4 2015-01-21 05:15:19.000000000 +1300
15 +++ b/m4/libtool.m4 2017-10-22 11:15:33.516767555 +1300
16 @@ -5571,14 +5571,14 @@
17 # Tell ltmain to make .dll files, not .so files.
18 shrext_cmds=.dll
19 # FIXME: Setting linknames here is a bad hack.
20 - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
21 + _LT_TAGVAR(archive_cmds, $1)='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
22 _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
23 cp "$export_symbols" "$output_objdir/$soname.def";
24 echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
25 else
26 $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
27 fi~
28 - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
29 + $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
30 linknames='
31 # The linker will not automatically build a static lib if we build a DLL.
32 # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'