]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
libtool: align archive_cmds with archive_expsym_cmds for MSVC
authorPeter Rosin <peda@lysator.liu.se>
Tue, 15 Jan 2013 14:29:49 +0000 (15:29 +0100)
committerPeter Rosin <peda@lysator.liu.se>
Wed, 16 Jan 2013 12:40:00 +0000 (13:40 +0100)
m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [MSVC]
<archive_cmds>: Specify the import library name, aligning with
archive_expsym_cmds.

Signed-off-by: Peter Rosin <peda@lysator.liu.se>
m4/libtool.m4

index 526fe81b69deb3d604d318f2851a1962f8bb9009..eb44de6db3c40610df2316d46626245dc2ab7a3f 100644 (file)
@@ -5161,7 +5161,7 @@ _LT_EOF
        # Tell ltmain to make .dll files, not .so files.
        shrext_cmds=.dll
        # FIXME: Setting linknames here is a bad hack.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+       _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
        _LT_TAGVAR(archive_expsym_cmds, $1)='if test EXPORTS = "`$SED 1q $export_symbols`"; then
            cp "$export_symbols" "$output_objdir/$soname.def";
            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
@@ -6153,7 +6153,7 @@ if test yes != "$_lt_caught_CXX_error"; then
          # Tell ltmain to make .dll files, not .so files.
          shrext_cmds=.dll
          # FIXME: Setting linknames here is a bad hack.
-         _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+         _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
          _LT_TAGVAR(archive_expsym_cmds, $1)='if test EXPORTS = "`$SED 1q $export_symbols`"; then
              cp "$export_symbols" "$output_objdir/$soname.def";
              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";