Changeset 81091

Timestamp:

07/25/11 08:52:41 (4 years ago)

Author:

jeremyhu@…

Message:

muniversal: Try using libtool if lipo fails, lipo can't sew together LLVM bitcode. #29842

File:

• trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl (modified) (1 diff)

trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

@@ -452 +452 @@
                         } else {
                             # Actually try to merge the files
-                            # First try lipo
+                            # First try lipo, then libtool
                             if { ! [catch {system "/usr/bin/lipo -create \"${dir1}/${fl}\" \"${dir2}/${fl}\" -output \"${dir}/${fl}\""}] } {
                                 # lipo worked
                                 ui_debug "universal: merge: lipo created ${prefixDir}/${fl}"
+                            } elseif { ! [catch {system "/usr/bin/libtool \"${dir1}/${fl}\" \"${dir2}/${fl}\" -o \"${dir}/${fl}\""}] } {
+                                # libtool worked
+                                ui_debug "universal: merge: libtool created ${prefixDir}/${fl}"
                             } else {
-                                # lipo has failed, so assume they are text files to be merged
+                                # lipo and libtool have failed, so assume they are text files to be merged
                                 set dontdiff no
                                 foreach dont ${merger_dont_diff} {