annotate make/bsd/makefiles/defs.make @ 4940:f09ae3853e3b

7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk Reviewed-by: rbackman, jrose, dholmes
author twisti
date Mon, 13 Feb 2012 04:30:59 -0800
parents 64b46f975ab8
children 2d503de963b3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3960
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
1 #
4865
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
3960
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
4 #
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
5 # This code is free software; you can redistribute it and/or modify it
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
6 # under the terms of the GNU General Public License version 2 only, as
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
7 # published by the Free Software Foundation.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
8 #
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
9 # This code is distributed in the hope that it will be useful, but WITHOUT
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
12 # version 2 for more details (a copy is included in the LICENSE file that
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
13 # accompanied this code).
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
14 #
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
15 # You should have received a copy of the GNU General Public License version
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
16 # 2 along with this work; if not, write to the Free Software Foundation,
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
18 #
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
20 # or visit www.oracle.com if you need additional information or have any
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
21 # questions.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
22 #
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
23 #
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
24
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
25 # The common definitions for hotspot bsd builds.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
26 # Include the top level defs.make under make directory instead of this one.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
27 # This file is included into make/defs.make.
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
28
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
29 SLASH_JAVA ?= /java
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
30
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
31 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
32 ARCH:=$(shell uname -m)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
33 PATH_SEP = :
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
34 ifeq ($(LP64), 1)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
35 ARCH_DATA_MODEL ?= 64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
36 else
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
37 ARCH_DATA_MODEL ?= 32
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
38 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
39
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
40 # zero
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
41 ifeq ($(ZERO_BUILD), true)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
42 ifeq ($(ARCH_DATA_MODEL), 64)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
43 MAKE_ARGS += LP64=1
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
44 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
45 PLATFORM = bsd-zero
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
46 VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH))
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
47 HS_ARCH = zero
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
48 ARCH = zero
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
49 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
50
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
51 # ia64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
52 ifeq ($(ARCH), ia64)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
53 ARCH_DATA_MODEL = 64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
54 MAKE_ARGS += LP64=1
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
55 PLATFORM = bsd-ia64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
56 VM_PLATFORM = bsd_ia64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
57 HS_ARCH = ia64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
58 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
59
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
60 # sparc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
61 ifeq ($(ARCH), sparc64)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
62 ifeq ($(ARCH_DATA_MODEL), 64)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
63 ARCH_DATA_MODEL = 64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
64 MAKE_ARGS += LP64=1
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
65 PLATFORM = bsd-sparcv9
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
66 VM_PLATFORM = bsd_sparcv9
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
67 else
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
68 ARCH_DATA_MODEL = 32
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
69 PLATFORM = bsd-sparc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
70 VM_PLATFORM = bsd_sparc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
71 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
72 HS_ARCH = sparc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
73 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
74
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
75 # amd64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
76 ifneq (,$(findstring $(ARCH), amd64 x86_64))
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
77 ifeq ($(ARCH_DATA_MODEL), 64)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
78 ARCH_DATA_MODEL = 64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
79 MAKE_ARGS += LP64=1
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
80 PLATFORM = bsd-amd64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
81 VM_PLATFORM = bsd_amd64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
82 HS_ARCH = x86
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
83 else
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
84 ARCH_DATA_MODEL = 32
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
85 PLATFORM = bsd-i586
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
86 VM_PLATFORM = bsd_i486
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
87 HS_ARCH = x86
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
88 # We have to reset ARCH to i386 since SRCARCH relies on it
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
89 ARCH = i386
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
90 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
91 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
92
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
93 # i386
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
94 ifeq ($(ARCH), i386)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
95 ifeq ($(ARCH_DATA_MODEL), 64)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
96 ARCH_DATA_MODEL = 64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
97 MAKE_ARGS += LP64=1
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
98 PLATFORM = bsd-amd64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
99 VM_PLATFORM = bsd_amd64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
100 HS_ARCH = x86
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
101 # We have to reset ARCH to amd64 since SRCARCH relies on it
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
102 ARCH = amd64
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
103 else
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
104 ARCH_DATA_MODEL = 32
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
105 PLATFORM = bsd-i586
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
106 VM_PLATFORM = bsd_i486
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
107 HS_ARCH = x86
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
108 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
109 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
110
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
111 # ARM
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
112 ifeq ($(ARCH), arm)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
113 ARCH_DATA_MODEL = 32
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
114 PLATFORM = bsd-arm
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
115 VM_PLATFORM = bsd_arm
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
116 HS_ARCH = arm
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
117 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
118
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
119 # PPC
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
120 ifeq ($(ARCH), ppc)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
121 ARCH_DATA_MODEL = 32
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
122 PLATFORM = bsd-ppc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
123 VM_PLATFORM = bsd_ppc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
124 HS_ARCH = ppc
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
125 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
126
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
127 JDK_INCLUDE_SUBDIR=bsd
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
128
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
129 # Library suffix
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
130 OS_VENDOR:=$(shell uname -s)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
131 ifeq ($(OS_VENDOR),Darwin)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
132 LIBRARY_SUFFIX=dylib
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
133 else
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
134 LIBRARY_SUFFIX=so
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
135 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
136
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
137 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
138 VM_DEBUG=jvmg
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
139
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
140 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
141
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
142 # client and server subdirectories have symbolic links to ../libjsig.so
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
143 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
144 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
4846
e8a4934564b2 7125793: MAC: test_gamma should always work
phh
parents: 4006
diff changeset
145 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
3960
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
146
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
147 ifndef BUILD_CLIENT_ONLY
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
148 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
149 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
150 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
151
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
152 ifneq ($(ZERO_BUILD), true)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
153 ifeq ($(ARCH_DATA_MODEL), 32)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
154 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
155 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
156 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
157 endif
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
158
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
159 # Serviceability Binaries
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
160 # No SA Support for PPC, IA64, ARM or zero
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
161 ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
162 $(EXPORT_LIB_DIR)/sa-jdi.jar
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
163 ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
164 $(EXPORT_LIB_DIR)/sa-jdi.jar
4006
436b4a3231bf 7098194: integrate macosx-port changes
dcubed
parents: 3960
diff changeset
165 ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
436b4a3231bf 7098194: integrate macosx-port changes
dcubed
parents: 3960
diff changeset
166 $(EXPORT_LIB_DIR)/sa-jdi.jar
3960
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
167 ADD_SA_BINARIES/ppc =
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
168 ADD_SA_BINARIES/ia64 =
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
169 ADD_SA_BINARIES/arm =
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
170 ADD_SA_BINARIES/zero =
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
171
f08d439fab8c 7089790: integrate bsd-port changes
never
parents:
diff changeset
172 EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
4006
436b4a3231bf 7098194: integrate macosx-port changes
dcubed
parents: 3960
diff changeset
173
4865
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
174 # Universal build settings
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
175 ifeq ($(OS_VENDOR), Darwin)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
176 # Build universal binaries by default on Mac OS X
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
177 MACOSX_UNIVERSAL = true
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
178 ifneq ($(ALT_MACOSX_UNIVERSAL),)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
179 MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
180 endif
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
181 MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
182
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
183 # Universal settings
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
184 ifeq ($(MACOSX_UNIVERSAL), true)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
185
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
186 # Set universal export path but avoid using ARCH or PLATFORM subdirs
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
187 EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
4886
64b46f975ab8 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 4865
diff changeset
188 ifneq ($(ALT_EXPORT_PATH),)
64b46f975ab8 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 4865
diff changeset
189 EXPORT_PATH=$(ALT_EXPORT_PATH)
64b46f975ab8 7142616: MAC: Honor ALT_EXPORT_PATH overrides from JDK control builds
phh
parents: 4865
diff changeset
190 endif
4006
436b4a3231bf 7098194: integrate macosx-port changes
dcubed
parents: 3960
diff changeset
191
4865
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
192 # Set universal image dir
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
193 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
4940
f09ae3853e3b 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 4886
diff changeset
194 ifneq ($(ALT_JDK_IMAGE_DIR),)
f09ae3853e3b 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 4886
diff changeset
195 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
f09ae3853e3b 7143766: add ALT_JDK_IMAGE_DIR and improve test_jdk
twisti
parents: 4886
diff changeset
196 endif
4865
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
197
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
198 # Binaries to 'universalize' if built
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
199 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
200 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
201 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
202 UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
203
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
204 # Files to simply copy in place
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
205 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
206 UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
207
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
208 endif
481a9443f721 7123386: RFE: Preserve universal builds of HotSpot on Mac OS X
phh
parents: 4846
diff changeset
209 endif