Mercurial > hg > truffle
annotate make/windows/makefiles/defs.make @ 6040:c7ed11779ce8
7159772: instanceKlass::all_fields_count() returns incorrect total field count
Summary: Fix instanceKlass::all_fields_count() bug.
Reviewed-by: kvn, never
Contributed-by: Jiangli Zhou <jiangli.zhou@oracle.com>
author | jiangli |
---|---|
date | Tue, 10 Apr 2012 09:31:04 -0700 |
parents | 3d7ea1dbe0de |
children | 74c359c4a9e5 |
rev | line source |
---|---|
0 | 1 # |
5915 | 2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. |
0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | |
5 # This code is free software; you can redistribute it and/or modify it | |
6 # under the terms of the GNU General Public License version 2 only, as | |
7 # published by the Free Software Foundation. | |
8 # | |
9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 # version 2 for more details (a copy is included in the LICENSE file that | |
13 # accompanied this code). | |
14 # | |
15 # You should have received a copy of the GNU General Public License version | |
16 # 2 along with this work; if not, write to the Free Software Foundation, | |
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 # | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1485
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1485
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1485
diff
changeset
|
21 # questions. |
0 | 22 # |
23 # | |
24 | |
25 # The common definitions for hotspot windows builds. | |
26 # Include the top level defs.make under make directory instead of this one. | |
27 # This file is included into make/defs.make. | |
427
3c07cda72b7d
6764892: VS2008 changes required to compile hotspot sources
tbell
parents:
271
diff
changeset
|
28 # On windows it is only used to construct parameters for |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
29 # make/windows/build.make when make/Makefile is used to build VM. |
0 | 30 |
31 SLASH_JAVA ?= J: | |
32 PATH_SEP = ; | |
33 | |
34 # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name | |
1598
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
35 ifeq ($(ARCH_DATA_MODEL),32) |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
36 ARCH_DATA_MODEL=32 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
37 PLATFORM=windows-i586 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
38 VM_PLATFORM=windows_i486 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
39 HS_ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
40 MAKE_ARGS += ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
41 MAKE_ARGS += BUILDARCH=i486 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
42 MAKE_ARGS += Platform_arch=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
43 MAKE_ARGS += Platform_arch_model=x86_32 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
44 endif |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
45 |
0 | 46 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) x86),) |
47 ARCH_DATA_MODEL=32 | |
48 PLATFORM=windows-i586 | |
49 VM_PLATFORM=windows_i486 | |
50 HS_ARCH=x86 | |
51 MAKE_ARGS += ARCH=x86 | |
52 MAKE_ARGS += BUILDARCH=i486 | |
53 MAKE_ARGS += Platform_arch=x86 | |
54 MAKE_ARGS += Platform_arch_model=x86_32 | |
55 endif | |
56 | |
1598
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
57 ifneq ($(ARCH_DATA_MODEL),32) |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
58 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) ia64),) |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
59 ARCH_DATA_MODEL=64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
60 PLATFORM=windows-ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
61 VM_PLATFORM=windows_ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
62 HS_ARCH=ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
63 MAKE_ARGS += LP64=1 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
64 MAKE_ARGS += ARCH=ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
65 MAKE_ARGS += BUILDARCH=ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
66 MAKE_ARGS += Platform_arch=ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
67 MAKE_ARGS += Platform_arch_model=ia64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
68 endif |
0 | 69 |
1485
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
456
diff
changeset
|
70 # http://support.microsoft.com/kb/888731 : this can be either |
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
456
diff
changeset
|
71 # AMD64 for AMD, or EM64T for Intel chips. |
1598
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
72 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
73 ARCH_DATA_MODEL=64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
74 PLATFORM=windows-amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
75 VM_PLATFORM=windows_amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
76 HS_ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
77 MAKE_ARGS += LP64=1 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
78 MAKE_ARGS += ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
79 MAKE_ARGS += BUILDARCH=amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
80 MAKE_ARGS += Platform_arch=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
81 MAKE_ARGS += Platform_arch_model=x86_64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
82 endif |
0 | 83 |
1557
70191885f707
6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers
prr
parents:
1552
diff
changeset
|
84 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),) |
1598
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
85 ARCH_DATA_MODEL=64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
86 PLATFORM=windows-amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
87 VM_PLATFORM=windows_amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
88 HS_ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
89 MAKE_ARGS += LP64=1 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
90 MAKE_ARGS += ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
91 MAKE_ARGS += BUILDARCH=amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
92 MAKE_ARGS += Platform_arch=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
93 MAKE_ARGS += Platform_arch_model=x86_64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
94 endif |
1557
70191885f707
6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers
prr
parents:
1552
diff
changeset
|
95 |
1485
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
456
diff
changeset
|
96 # NB later OS versions than 2003 may report "Intel64" |
1598
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
97 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),) |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
98 ARCH_DATA_MODEL=64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
99 PLATFORM=windows-amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
100 VM_PLATFORM=windows_amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
101 HS_ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
102 MAKE_ARGS += LP64=1 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
103 MAKE_ARGS += ARCH=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
104 MAKE_ARGS += BUILDARCH=amd64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
105 MAKE_ARGS += Platform_arch=x86 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
106 MAKE_ARGS += Platform_arch_model=x86_64 |
e13a5c0ed5e2
6964882: 32 bit JDK does not build on 64 bit Windows platforms
prr
parents:
1557
diff
changeset
|
107 endif |
1485
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
456
diff
changeset
|
108 endif |
fb57d4cf76c2
6931180: Migration to recent versions of MS Platform SDK
prr
parents:
456
diff
changeset
|
109 |
5946
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
110 # On 32 bit windows we build server, client and kernel, on 64 bit just server. |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
111 ifeq ($(JVM_VARIANTS),) |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
112 ifeq ($(ARCH_DATA_MODEL), 32) |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
113 JVM_VARIANTS:=client,server,kernel |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
114 JVM_VARIANT_CLIENT:=true |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
115 JVM_VARIANT_SERVER:=true |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
116 JVM_VARIANT_KERNEL:=true |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
117 else |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
118 JVM_VARIANTS:=server |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
119 JVM_VARIANT_SERVER:=true |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
120 endif |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
121 endif |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
122 |
0 | 123 JDK_INCLUDE_SUBDIR=win32 |
124 | |
3960 | 125 # Library suffix |
126 LIBRARY_SUFFIX=dll | |
127 | |
427
3c07cda72b7d
6764892: VS2008 changes required to compile hotspot sources
tbell
parents:
271
diff
changeset
|
128 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined |
0 | 129 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make. |
130 | |
131 # next parameters are defined in $(GAMMADIR)/make/defs.make. | |
132 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) | |
133 MAKE_ARGS += JDK_MAJOR_VER=$(JDK_MAJOR_VERSION) | |
134 MAKE_ARGS += JDK_MINOR_VER=$(JDK_MINOR_VERSION) | |
135 MAKE_ARGS += JDK_MICRO_VER=$(JDK_MICRO_VERSION) | |
136 | |
137 ifdef COOKED_JDK_UPDATE_VERSION | |
138 MAKE_ARGS += JDK_UPDATE_VER=$(COOKED_JDK_UPDATE_VERSION) | |
139 endif | |
140 | |
141 # COOKED_BUILD_NUMBER should only be set if we have a numeric | |
142 # build number. It must not be zero padded. | |
143 ifdef COOKED_BUILD_NUMBER | |
144 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER) | |
145 endif | |
146 | |
147 NMAKE= MAKEFLAGS= MFLAGS= nmake /NOLOGO | |
148 | |
149 # Check for CYGWIN | |
150 ifneq (,$(findstring CYGWIN,$(shell uname))) | |
151 USING_CYGWIN=true | |
152 else | |
153 USING_CYGWIN=false | |
154 endif | |
155 # FIXUP: The subdirectory for a debug build is NOT the same on all platforms | |
156 VM_DEBUG=debug | |
157 | |
158 # Windows wants particular paths due to nmake (must be after macros defined) | |
159 # It is important that gnumake invokes nmake with C:\\...\\ formated | |
160 # strings so that nmake gets C:\...\ style strings. | |
161 # Check for CYGWIN | |
162 ifeq ($(USING_CYGWIN), true) | |
163 ABS_OUTPUTDIR := $(subst /,\\,$(shell /bin/cygpath -m -a "$(OUTPUTDIR)")) | |
164 ABS_BOOTDIR := $(subst /,\\,$(shell /bin/cygpath -m -a "$(BOOTDIR)")) | |
165 ABS_GAMMADIR := $(subst /,\\,$(shell /bin/cygpath -m -a "$(GAMMADIR)")) | |
271
818a18cd69a8
6730514: assertion failure in mangling code when expanding by 0 bytes
jmasa
parents:
196
diff
changeset
|
166 ABS_OS_MAKEFILE := $(shell /bin/cygpath -m -a "$(HS_MAKE_DIR)/$(OSNAME)")/build.make |
0 | 167 else |
168 ABS_OUTPUTDIR := $(subst /,\\,$(shell $(CD) $(OUTPUTDIR);$(PWD))) | |
169 ABS_BOOTDIR := $(subst /,\\,$(shell $(CD) $(BOOTDIR);$(PWD))) | |
170 ABS_GAMMADIR := $(subst /,\\,$(shell $(CD) $(GAMMADIR);$(PWD))) | |
91
a294fd0c4b38
6583644: Move all managed/SCCS files out of 'build' into 'make' directory
kamg
parents:
0
diff
changeset
|
171 ABS_OS_MAKEFILE := $(subst /,\\,$(shell $(CD) $(HS_MAKE_DIR)/$(OSNAME);$(PWD))/build.make) |
0 | 172 endif |
173 | |
174 # Disable building SA on windows until we are sure | |
175 # we want to release it. If we build it here, | |
176 # the SDK makefiles will copy it over and put it into | |
177 # the created image. | |
456
b6272ef4a18f
6743339: Enable building sa-jdi.jar and sawindbg.dll on Windows with hotspot build
poonam
parents:
427
diff
changeset
|
178 BUILD_WIN_SA = 1 |
0 | 179 ifneq ($(ALT_BUILD_WIN_SA),) |
180 BUILD_WIN_SA = $(ALT_BUILD_WIN_SA) | |
181 endif | |
182 | |
183 ifeq ($(BUILD_WIN_SA), 1) | |
427
3c07cda72b7d
6764892: VS2008 changes required to compile hotspot sources
tbell
parents:
271
diff
changeset
|
184 ifeq ($(ARCH),ia64) |
0 | 185 BUILD_WIN_SA = 0 |
186 endif | |
187 endif | |
188 | |
189 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server | |
3846 | 190 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client |
191 EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel | |
192 | |
5946
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
193 ifeq ($(JVM_VARIANT_SERVER),true) |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
194 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
195 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX) |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
196 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
197 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
198 EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
199 endif |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
200 ifeq ($(JVM_VARIANT_CLIENT),true) |
0 | 201 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt |
3960 | 202 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX) |
0 | 203 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb |
204 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map | |
5946
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
205 endif |
3d7ea1dbe0de
7141246: build-infra merge: Introduce new JVM_VARIANT* to control which kind of jvm gets built
erikj
parents:
5919
diff
changeset
|
206 ifeq ($(JVM_VARIANT_KERNEL),true) |
0 | 207 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt |
3960 | 208 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX) |
0 | 209 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb |
210 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map | |
211 endif | |
212 | |
5915 | 213 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar |
214 | |
0 | 215 ifeq ($(BUILD_WIN_SA), 1) |
3960 | 216 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX) |
0 | 217 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb |
218 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map | |
427
3c07cda72b7d
6764892: VS2008 changes required to compile hotspot sources
tbell
parents:
271
diff
changeset
|
219 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar |
0 | 220 # Must pass this down to nmake. |
221 MAKE_ARGS += BUILD_WIN_SA=1 | |
222 endif | |
5897
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
223 |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
224 # Propagate compiler and tools paths from configure to nmake. |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
225 # Need to make sure they contain \\ and not /. |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
226 ifneq ($(SPEC),) |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
227 ifeq ($(USING_CYGWIN), true) |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
228 MAKE_ARGS += CXX="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(CXX)))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
229 MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(LD)))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
230 MAKE_ARGS += RC="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(RC)))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
231 MAKE_ARGS += MT="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(MT)))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
232 else |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
233 MAKE_ARGS += CXX="$(subst /,\\,$(CXX))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
234 MAKE_ARGS += LD="$(subst /,\\,$(LD))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
235 MAKE_ARGS += RC="$(subst /,\\,$(RC))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
236 MAKE_ARGS += MT="$(subst /,\\,$(MT))" |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
237 endif |
7292cff45988
7141244: build-infra merge: Include $(SPEC) in makefiles and make variables overridable
erikj
parents:
3960
diff
changeset
|
238 endif |