>From 449723f9bdcad6946e098d7acf0f215f3a4c18a2 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Sun, 5 Sep 2010 17:53:35 +0200 Subject: [PATCH 5/7] Convert POSIX file names to toolchain format for MSVC * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) [mingw] : Make sure the -outputresource: file name for the manifest tool is in Win32 format. Same for the MSVC command file containing the exports. Signed-off-by: Peter Rosin --- ChangeLog | 8 ++++++++ libltdl/m4/libtool.m4 | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fcdc89..3c6b5c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-09-05 Peter Rosin + Convert POSIX file names to toolchain format for MSVC + * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG) + [mingw] : Make sure the -outputresource: file name for the + manifest tool is in Win32 format. Same for the MSVC command file + containing the exports. + +2010-09-05 Peter Rosin + Use func_to_tool_file instead of fix_srcfile_path. * libltdl/config/ltmain.m4sh (func_mode_compile): Replace the fix_srcfile_path hook with a call to func_to_tool_file. diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index 132dd2c..b1553f3 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -5004,7 +5004,8 @@ _LT_EOF else sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; fi~ - $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~ + func_to_tool_file "$output_objdir/$soname.exp"~ + $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs "@$func_to_tool_file_result" -Wl,-DLL~ linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' @@ -5017,8 +5018,9 @@ _LT_EOF *.exe|*.EXE) ;; *) lt_outputfile="$lt_outputfile.exe" ;; esac~ + func_to_tool_file "$lt_outputfile"~ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1; + $MANIFEST_TOOL -manifest "$func_to_tool_file_result.manifest" -outputresource:"$func_to_tool_file_result" || exit 1; $RM "$lt_outputfile.manifest"; fi' ;; @@ -5999,7 +6001,8 @@ if test "$_lt_caught_CXX_error" != yes; then else $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; fi~ - $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs @$output_objdir/$soname.exp -Wl,-DLL~ + func_to_tool_file "$output_objdir/$soname.exp"~ + $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs "@$func_to_tool_file_result" -Wl,-DLL~ linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' @@ -6011,8 +6014,9 @@ if test "$_lt_caught_CXX_error" != yes; then *.exe|*.EXE) ;; *) lt_outputfile="$lt_outputfile.exe" ;; esac~ + func_to_tool_file "$lt_outputfile"~ if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_outputfile.manifest" -outputresource:"$lt_outputfile" || exit 1; + $MANIFEST_TOOL -manifest "$func_to_tool_file_result.manifest" -outputresource:"$func_to_tool_file_result" || exit 1; $RM "$lt_outputfile.manifest"; fi' ;; -- 1.7.1