changeset 3148:2443a342151b

[MSVC] fix invalid sed replacement to disable libtool auto-export
author Michael Goffioul <michael.goffioul@gmail.com>
date Wed, 17 Jul 2013 10:06:58 -0400
parents 9cd2f1a4d68f
children 7bd867b6fc5b
files src/build-msvctools/lt-postproc
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/build-msvctools/lt-postproc	Wed Jul 17 10:06:18 2013 -0400
+++ b/src/build-msvctools/lt-postproc	Wed Jul 17 10:06:58 2013 -0400
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+set -x
 prefix=
 suffix=
 no_auto_export=false
@@ -21,7 +22,7 @@
 
 SED_ARGS=
 if $no_auto_export; then
-	SED_ARGS="$SED_ARGS -e 's/^always_export_symbols=.*/always_export_symbols=/'"
+	SED_ARGS="$SED_ARGS -e s/^always_export_symbols=.*/always_export_symbols=/"
 fi
 
 for ltfile in $libtool_files; do
@@ -30,7 +31,7 @@
 		-e "s/\.dll\.lib/\.lib/" \
 		-e "s/^\(deplibs_check_method\)=.*/\1=\"pass_all\"/" \
 		-e "s/-link\\>//" \
-		-e "/^archive_cmds=/ { s/-Wl,-dll~/&,-IMPLIB:\\\\\\\"\\\$tool_output_objdir\\\$libname.lib\\\\\\\"/; }" \
+		-e '/^archive_cmds=/ { s/-Wl,-dll~/-Wl,-dll,-IMPLIB:\\\\\\"\\$tool_output_objdir\\$libname.lib\\\\\\"~/; }' \
 		$SED_ARGS \
 		$ltfile
 done