>From a519184f2de3ceb351880aefe4164e7f473cff95 Mon Sep 17 00:00:00 2001
From: Peter Rosin
Date: Wed, 25 Aug 2010 10:42:16 +0200
Subject: [PATCH 7/8] Convert POSIX paths to toolchain format for MSVC
* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
[mingw] : Make sure the -outputresource: path 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 | 10 ++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d944a5c..771a442 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-08-25 Peter Rosin
+ Convert POSIX paths with prefixes to host format for MSYS/MSVC
+ * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG)
+ [mingw] : Make sure the -outputresource: path for the
+ manifest tool is in Win32 format. Same for the MSVC command file
+ containing the exports.
+
+2010-08-25 Peter Rosin
+
Use func_to_tool_path instead of fix_srcfile_path.
* libltdl/config/ltmain.m4sh (func_mode_compile): Replace the
fix_srcfile_path hook with a call to func_to_host_path.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 7e4a146..2e90b5a 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4953,7 +4953,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_path "$output_objdir/$soname.exp"~
+ $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs "@$func_to_tool_path_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'
@@ -4962,6 +4963,8 @@ _LT_EOF
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ func_to_tool_path "$lt_outputfile"~
+ lt_outputfile=$func_to_tool_path_result~
case $lt_outputfile in
*.exe|*.EXE) ;;
*) lt_outputfile="$lt_outputfile.exe" ;;
@@ -5939,7 +5942,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_path "$output_objdir/$soname.exp"~
+ $CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs "@$func_to_tool_path_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'
@@ -5947,6 +5951,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+ func_to_tool_path "$lt_outputfile"~
+ lt_outputfile=$func_to_tool_path_result~
case $lt_outputfile in
*.exe|*.EXE) ;;
*) lt_outputfile="$lt_outputfile.exe" ;;
--
1.7.1