make/bsd/makefiles/universal.gmk

rev 6239 : Fix non-product (aka. optimized) build on MacOS X

*** 27,36 ****
--- 27,38 ----
          $(MAKE) MACOSX_UNIVERSAL=true all_product_universal
  universal_fastdebug:
          $(MAKE) MACOSX_UNIVERSAL=true all_fastdebug_universal
  universal_debug:
          $(MAKE) MACOSX_UNIVERSAL=true all_debug_universal
+ universal_optimized:
+         $(MAKE) MACOSX_UNIVERSAL=true all_optimized_universal
  
  
  # Universal builds include 1 or more architectures in a single binary
  all_product_universal:
  #       $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_PRODUCT_TARGETS)
*** 42,51 ****
--- 44,57 ----
          $(QUIETLY) $(MAKE) BUILD_FLAVOR=fastdebug EXPORT_SUBDIR=/fastdebug universalize
  all_debug_universal:
  #       $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_DEBUG_TARGETS)
          $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_DEBUG_TARGETS)
          $(QUIETLY) $(MAKE) BUILD_FLAVOR=debug EXPORT_SUBDIR=/debug universalize
+ all_optimized_universal:
+ #       $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_OPTIMIZED_TARGETS)
+         $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_OPTIMIZED_TARGETS)
+         $(QUIETLY) $(MAKE) BUILD_FLAVOR=optimized EXPORT_SUBDIR=/optimized universalize
  
  
  # Consolidate architecture builds into a single Universal binary
  universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
          $(RM) -r $(EXPORT_PATH)/jre/lib/{i386,amd64}