From: Peter O'Gorman <peter@pogma.com>
Date: Mon, 21 Feb 2005 13:51:28 +0000 (+0000)
Subject: * config/ltmain.m4sh (func_extract_archives) [darwin]: This didn't
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eba2a2a0ca6e515825ae5e6d97574d1f794c4423;p=thirdparty%2Flibtool.git

* config/ltmain.m4sh (func_extract_archives) [darwin]: This didn't
actually work on a real fat archive, should do now.
---

diff --git a/ChangeLog b/ChangeLog
index fd41a2638..866d39416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-21  Peter O'Gorman  <peter@pogma.com>
+
+	* config/ltmain.m4sh (func_extract_archives) [darwin]: This didn't
+	actually work on a real fat archive, should do now.
+
 2005-02-07  Peter O'Gorman  <peter@pogma.com>
 
 	* config/ltmain.m4sh: Add -pthread like flags when linking
diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 28f5bac56..6d6278a15 100644
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -1007,14 +1007,13 @@ func_extract_archives ()
 	    for darwin_arch in  $darwin_arches ; do
 	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
 	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      # Remove the table of contents from the thin files.
-	      $AR d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
-	      $AR d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
-	      func_extract_an_archive "unfat-$$/${darwin_base_archive}-${darwin_arch}" "${darwin_base_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
 	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
 	    done # $darwin_arches
             ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do