make/bsd/makefiles/universal.gmk

*** 54,70 ****
  
  # Consolidate architecture builds into a single Universal binary
  universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
          $(RM) -r $(EXPORT_PATH)/lib/{i386,amd64}
  
  
  # Package built libraries in a universal binary
  $(UNIVERSAL_LIPO_LIST):
          BUILT_LIPO_FILES="`find $(EXPORT_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_LIB_DIR)/,,$@) 2>/dev/null`" || test $$? = "1"; \
          if [ -n "$${BUILT_LIPO_FILES}" ]; then \
            $(MKDIR) -p $(shell dirname $@); \
!           lipo -create -output $@ $${BUILT_LIPO_FILES}; \
          fi
  
  
  # Copy built non-universal binaries in place
  # - copies directories; including empty dirs
--- 54,71 ----
  
  # Consolidate architecture builds into a single Universal binary
  universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
          $(RM) -r $(EXPORT_PATH)/lib/{i386,amd64}
  
+ LIPO ?= lipo
  
  # Package built libraries in a universal binary
  $(UNIVERSAL_LIPO_LIST):
          BUILT_LIPO_FILES="`find $(EXPORT_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_LIB_DIR)/,,$@) 2>/dev/null`" || test $$? = "1"; \
          if [ -n "$${BUILT_LIPO_FILES}" ]; then \
            $(MKDIR) -p $(shell dirname $@); \
!           $(LIPO) -create -output $@ $${BUILT_LIPO_FILES}; \
          fi
  
  
  # Copy built non-universal binaries in place
  # - copies directories; including empty dirs