From: Peter Ekberg <peda@lysator.liu.se>
Date: Thu, 29 Sep 2005 16:59:43 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (func_mode_link): Don't modify
X-Git-Tag: release-2-1b~488
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96ce07aaa6c2b94f5d1ab234e9f49199e80ecaf0;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (func_mode_link): Don't modify
user provided symbols file. Adjust removal of temporary files
and also remove temporary files used during symbols file
filtering.
---

diff --git a/ChangeLog b/ChangeLog
index 1a8898651..4a41bfa6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-29  Peter Ekberg  <peda@lysator.liu.se>
+
+	* libltdl/config/ltmain.m4sh (func_mode_link): Don't modify
+	user provided symbols file. Adjust removal of temporary files
+	and also remove temporary files used during symbols file
+	filtering.
+
 2005-09-29  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
 	* libtoolize.m4sh (func_included_files): Do not recurse
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 68f18bcdd..1ac571990 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4932,6 +4932,13 @@ EOF
 	# Use standard objects if they are pic
 	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 
+	delfiles=
+	if test -n "$export_symbols$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  delfiles="$delfiles $export_symbols"
+	fi
+
 	orig_export_symbols=
 	case $host_os in
 	cygwin* | mingw*)
@@ -4984,7 +4991,7 @@ EOF
 	  fi
 	fi
 
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	if test -n "$export_symbols$include_expsyms"; then
 	  tmp_export_symbols="$export_symbols"
 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
 	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
@@ -4999,6 +5006,7 @@ EOF
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[[ ,]]DATA/!d;s,\(.*\)\([[ \,]].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -5084,7 +5092,6 @@ EOF
 	  test_cmds=
 	  concat_cmds=
 	  objlist=
-	  delfiles=
 	  last_robj=
 	  k=1
 
@@ -5211,9 +5218,10 @@ EOF
 	      cmds=$archive_cmds
 	    fi
 	  fi
+	fi
 
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
 	  eval cmds=\"\$cmds~\$RM $delfiles\"
 	fi