svn commit: r619010 - /apr/apr/trunk/build/jlibtool.c

[je...@apache.org]

Author: jerenkrantz
Date: Wed Feb  6 07:04:22 2008
New Revision: 619010

URL: http://svn.apache.org/viewvc?rev=619010&view=rev
Log:
* build/jlibtool.c
  (explode_static_lib): Skip over __.SYMDEF and friends on Mac OS X.

Modified:
    apr/apr/trunk/build/jlibtool.c

Modified: apr/apr/trunk/build/jlibtool.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/jlibtool.c?rev=619010&r1=619009&r2=619010&view=diff
==============================================================================
--- apr/apr/trunk/build/jlibtool.c (original)
+++ apr/apr/trunk/build/jlibtool.c Wed Feb  6 07:04:22 2008
@@ -1228,6 +1228,15 @@
     dir = opendir(tmpdir);
 
     while ((entry = readdir(dir)) != NULL) {
+#if defined(__APPLE__) && defined(RANLIB)
+        /* Apple inserts __.SYMDEF which isn't needed.
+         * Leopard (10.5+) can also add '__.SYMDEF SORTED' which isn't
+         * much fun either.  Just skip them.
+         */
+        if (strstr(entry->d_name, "__.SYMDEF") != NULL) {
+            continue;
+        }
+#endif
         if (entry->d_name[0] != '.') {
             push_count_chars(&tmpdir_cc, entry->d_name);
             name = flatten_count_chars(&tmpdir_cc, 0);