Ignore:
Timestamp:
Jul 25, 2011, 3:52:41 PM (8 years ago)
Author:
jeremyhu@…
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

    r79694 r81091  
    452452                        } else {
    453453                            # Actually try to merge the files
    454                             # First try lipo
     454                            # First try lipo, then libtool
    455455                            if { ! [catch {system "/usr/bin/lipo -create \"${dir1}/${fl}\" \"${dir2}/${fl}\" -output \"${dir}/${fl}\""}] } {
    456456                                # lipo worked
    457457                                ui_debug "universal: merge: lipo created ${prefixDir}/${fl}"
     458                            } elseif { ! [catch {system "/usr/bin/libtool \"${dir1}/${fl}\" \"${dir2}/${fl}\" -o \"${dir}/${fl}\""}] } {
     459                                # libtool worked
     460                                ui_debug "universal: merge: libtool created ${prefixDir}/${fl}"
    458461                            } else {
    459                                 # lipo has failed, so assume they are text files to be merged
     462                                # lipo and libtool have failed, so assume they are text files to be merged
    460463                                set dontdiff no
    461464                                foreach dont ${merger_dont_diff} {
Note: See TracChangeset for help on using the changeset viewer.