Mercurial > hg > truffle

comparison make/Makefile @ 4007:23a1c8de9d51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dholmes
date Mon, 17 Oct 2011 01:40:27 -0400
parents 436b4a3231bf
children 04b9a2566eec 94ec88ca68e2
comparison
equal deleted inserted replaced
4004:11d17c7d2ee6 4007:23a1c8de9d51
469 ($(CD) $(JDK_IMPORT_PATH) && \ 469 ($(CD) $(JDK_IMPORT_PATH) && \
470 $(TAR) -cf - $(JDK_DIRS)) | \ 470 $(TAR) -cf - $(JDK_DIRS)) | \
471 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \ 471 ($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
472 fi 472 fi
473 473
474 # macosx universal builds
475
476 ifeq ($(MACOSX_UNIVERSAL), true)
477 $(UNIVERSAL_LIPO_LIST):
478 lipo -create -output $@ $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)
479
480 $(UNIVERSAL_COPY_LIST):
481 $(CP) $(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) $@
482
483 universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
484 endif
485
486 universal_product:
487 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_product
488 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_product
489 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
490 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
491
492 universal_fastdebug:
493 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_fastdebug
494 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_fastdebug
495 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
496 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
497
498 universal_debug:
499 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_debug
500 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_debug
501 $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
502 $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
503
474 # 504 #
475 # Check target 505 # Check target
476 # 506 #
477 check: variable_check 507 check: variable_check
478 508
597 $(KERNEL_VM_TARGETS) \ 627 $(KERNEL_VM_TARGETS) \
598 generic_build1 generic_build2 generic_buildkernel generic_export \ 628 generic_build1 generic_build2 generic_buildkernel generic_export \
599 export_product export_fastdebug export_debug export_optimized \ 629 export_product export_fastdebug export_debug export_optimized \
600 export_jdk_product export_jdk_fastdebug export_jdk_debug \ 630 export_jdk_product export_jdk_fastdebug export_jdk_debug \
601 create_jdk copy_jdk update_jdk test_jdk \ 631 create_jdk copy_jdk update_jdk test_jdk \
602 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk 632 copy_product_jdk copy_fastdebug_jdk copy_debug_jdk universalize \
603 633 universal_product
634