make/bsd/makefiles/universal.gmk

rev 3388 : imported patch diff.patch

*** 48,69 ****
  
  # Consolidate architecture builds into a single Universal binary
  universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
          $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64}
  
  
  # Package built libraries in a universal binary
! $(UNIVERSAL_LIPO_LIST):
          BUILT_LIPO_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
          if [ -n "$${BUILT_LIPO_FILES}" ]; then \
            $(MKDIR) -p $(shell dirname $@); \
            lipo -create -output $@ $${BUILT_LIPO_FILES}; \
          fi      
  
  
  # Copy built non-universal binaries in place
! $(UNIVERSAL_COPY_LIST):
          BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
          if [ -n "$${BUILT_COPY_FILES}" ]; then \
            for i in $${BUILT_COPY_FILES}; do \
              if [ -f $${i} ]; then \
                $(MKDIR) -p $(shell dirname $@); \
--- 48,70 ----
  
  # Consolidate architecture builds into a single Universal binary
  universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
          $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64}
  
+ EMPTY_FORCE:
  
  # Package built libraries in a universal binary
! $(UNIVERSAL_LIPO_LIST): EMPTY_FORCE
          BUILT_LIPO_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
          if [ -n "$${BUILT_LIPO_FILES}" ]; then \
            $(MKDIR) -p $(shell dirname $@); \
            lipo -create -output $@ $${BUILT_LIPO_FILES}; \
          fi      
  
  
  # Copy built non-universal binaries in place
! $(UNIVERSAL_COPY_LIST): EMPTY_FORCE
          BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
          if [ -n "$${BUILT_COPY_FILES}" ]; then \
            for i in $${BUILT_COPY_FILES}; do \
              if [ -f $${i} ]; then \
                $(MKDIR) -p $(shell dirname $@); \