Mercurial > hg > truffle

comparison make/windows/build.make @ 7482:989155e2d07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 957c266d8bc5 892acf0431ef
children b9a918201d47
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
31 # that "sh" be accessible on the PATH. An MKS install does this. 31 # that "sh" be accessible on the PATH. An MKS install does this.
32 32
33 # SA components are built if BUILD_WIN_SA=1 is specified. 33 # SA components are built if BUILD_WIN_SA=1 is specified.
34 # See notes in README. This produces files: 34 # See notes in README. This produces files:
35 # 1. sa-jdi.jar - This is built before building jvm.dll 35 # 1. sa-jdi.jar - This is built before building jvm.dll
36 # 2. sawindbg[_g].dll - Native library for SA - This is built after jvm.dll 36 # 2. sawindbg.dll - Native library for SA - This is built after jvm.dll
37 # - Also, .lib, .map, .pdb. 37 # - Also, .lib, .map, .pdb.
38 # 38 #
39 # Please refer to ./makefiles/sa.make 39 # Please refer to ./makefiles/sa.make
40 40
41 # If we haven't set an ARCH yet use x86 41 # If we haven't set an ARCH yet use x86
115 !elseif "$(Variant)" == "graal" 115 !elseif "$(Variant)" == "graal"
116 VARIANT_TEXT=Graal 116 VARIANT_TEXT=Graal
117 !endif 117 !endif
118 118
119 ######################################################################### 119 #########################################################################
120 # Parameters for VERSIONINFO resource for jvm[_g].dll. 120 # Parameters for VERSIONINFO resource for jvm.dll.
121 # These can be overridden via the nmake.exe command line. 121 # These can be overridden via the nmake.exe command line.
122 # They are overridden by RE during the control builds. 122 # They are overridden by RE during the control builds.
123 # 123 #
124 !include "$(WorkSpace)/make/hotspot_version" 124 !include "$(WorkSpace)/make/hotspot_version"
125 125
225 225
226 !endif # ! "$(BUILD_WIN_SA)" != "1" 226 !endif # ! "$(BUILD_WIN_SA)" != "1"
227 227
228 ######################################################################### 228 #########################################################################
229 229
230 # With the jvm_g.dll now being named jvm.dll, we can't build both and place
231 # the dll's in the same directory, so we only build one at a time,
232 # re-directing the output to different output directories (done by user
233 # of this makefile).
234 #
235 defaultTarget: product 230 defaultTarget: product
236 231
237 # The product or release build is an optimized build, and is the default 232 # The product or release build is an optimized build, and is the default
238 233
239 # note that since all the build targets depend on local.make that BUILDARCH 234 # note that since all the build targets depend on local.make that BUILDARCH