Mercurial > hg > graal-compiler
comparison make/bsd/makefiles/universal.gmk @ 20804:7848fc12602b
Merge with jdk8u40-b25
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 14:58:49 +0200 |
parents | 63bae08b051e |
children |
comparison
equal
deleted
inserted
replaced
20184:84105dcdb05b | 20804:7848fc12602b |
---|---|
23 # | 23 # |
24 | 24 |
25 # macosx universal builds | 25 # macosx universal builds |
26 universal_product: | 26 universal_product: |
27 $(MAKE) MACOSX_UNIVERSAL=true all_product_universal | 27 $(MAKE) MACOSX_UNIVERSAL=true all_product_universal |
28 universal_optimized: | |
29 $(MAKE) MACOSX_UNIVERSAL=true all_optimized_universal | |
28 universal_fastdebug: | 30 universal_fastdebug: |
29 $(MAKE) MACOSX_UNIVERSAL=true all_fastdebug_universal | 31 $(MAKE) MACOSX_UNIVERSAL=true all_fastdebug_universal |
30 universal_debug: | 32 universal_debug: |
31 $(MAKE) MACOSX_UNIVERSAL=true all_debug_universal | 33 $(MAKE) MACOSX_UNIVERSAL=true all_debug_universal |
32 | 34 |
34 # Universal builds include 1 or more architectures in a single binary | 36 # Universal builds include 1 or more architectures in a single binary |
35 all_product_universal: | 37 all_product_universal: |
36 # $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_PRODUCT_TARGETS) | 38 # $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_PRODUCT_TARGETS) |
37 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_PRODUCT_TARGETS) | 39 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_PRODUCT_TARGETS) |
38 $(QUIETLY) $(MAKE) BUILD_FLAVOR=product EXPORT_SUBDIR= universalize | 40 $(QUIETLY) $(MAKE) BUILD_FLAVOR=product EXPORT_SUBDIR= universalize |
41 all_optimized_universal: | |
42 # $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_OPTIMIZED_TARGETS) | |
43 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_OPTIMIZED_TARGETS) | |
44 $(QUIETLY) $(MAKE) BUILD_FLAVOR=optimized EXPORT_SUBDIR=/optimized universalize | |
39 all_fastdebug_universal: | 45 all_fastdebug_universal: |
40 # $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_FASTDEBUG_TARGETS) | 46 # $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 $(COMMON_VM_FASTDEBUG_TARGETS) |
41 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_FASTDEBUG_TARGETS) | 47 $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 $(COMMON_VM_FASTDEBUG_TARGETS) |
42 $(QUIETLY) $(MAKE) BUILD_FLAVOR=fastdebug EXPORT_SUBDIR=/fastdebug universalize | 48 $(QUIETLY) $(MAKE) BUILD_FLAVOR=fastdebug EXPORT_SUBDIR=/fastdebug universalize |
43 all_debug_universal: | 49 all_debug_universal: |
96 | 102 |
97 # Additional processing for universal builds | 103 # Additional processing for universal builds |
98 export_product_jdk:: | 104 export_product_jdk:: |
99 $(MAKE) EXPORT_SUBDIR= export_universal | 105 $(MAKE) EXPORT_SUBDIR= export_universal |
100 export_optimized_jdk:: | 106 export_optimized_jdk:: |
101 $(MAKE) EXPORT_SUBDIR= export_universal | 107 $(MAKE) EXPORT_SUBDIR=/optimized export_universal |
102 export_fastdebug_jdk:: | 108 export_fastdebug_jdk:: |
103 $(MAKE) EXPORT_SUBDIR=/fastdebug export_universal | 109 $(MAKE) EXPORT_SUBDIR=/fastdebug export_universal |
104 export_debug_jdk:: | 110 export_debug_jdk:: |
105 $(MAKE) EXPORT_SUBDIR=/debug export_universal | 111 $(MAKE) EXPORT_SUBDIR=/debug export_universal |
106 copy_product_jdk:: | 112 copy_product_jdk:: |
107 $(MAKE) COPY_SUBDIR= copy_universal | 113 $(MAKE) COPY_SUBDIR= copy_universal |
114 copy_optimized_jdk:: | |
115 $(MAKE) COPY_SUBDIR=/optimized copy_universal | |
108 copy_fastdebug_jdk:: | 116 copy_fastdebug_jdk:: |
109 $(MAKE) COPY_SUBDIR=/fastdebug copy_universal | 117 $(MAKE) COPY_SUBDIR=/fastdebug copy_universal |
110 copy_debug_jdk:: | 118 copy_debug_jdk:: |
111 $(MAKE) COPY_SUBDIR=/debug copy_universal | 119 $(MAKE) COPY_SUBDIR=/debug copy_universal |
112 | 120 |
113 .PHONY: universal_product universal_fastdebug universal_debug \ | 121 .PHONY: universal_product universal_fastdebug universal_debug \ |
114 all_product_universal all_fastdebug_universal all_debug_universal \ | 122 all_product_universal all_fastdebug_universal all_debug_universal \ |
123 universal_optimized all_optimized_universal \ | |
115 universalize export_universal copy_universal \ | 124 universalize export_universal copy_universal \ |
116 $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST) | 125 $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST) |