Mercurial > hg > truffle

comparison make/windows/build.make @ 7408:892acf0431ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7153050: remove crufty '_g' support from HotSpot repo makefiles Summary: Phase 1 is removing '_g' support from the Makefiles. Reviewed-by: dcubed, sspitsyn, coleenp, tbell Contributed-by: ron.durbin@oracle.com
author dcubed
date Fri, 14 Dec 2012 10:06:52 -0800
parents 74c359c4a9e5
children 989155e2d07a 6b748c9e1845
comparison
equal deleted inserted replaced
7396:4a2ed49abd51 7408:892acf0431ef
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
113 !elseif "$(Variant)" == "kernel" 113 !elseif "$(Variant)" == "kernel"
114 VARIANT_TEXT=Kernel 114 VARIANT_TEXT=Kernel
115 !endif 115 !endif
116 116
117 ######################################################################### 117 #########################################################################
118 # Parameters for VERSIONINFO resource for jvm[_g].dll. 118 # Parameters for VERSIONINFO resource for jvm.dll.
119 # These can be overridden via the nmake.exe command line. 119 # These can be overridden via the nmake.exe command line.
120 # They are overridden by RE during the control builds. 120 # They are overridden by RE during the control builds.
121 # 121 #
122 !include "$(WorkSpace)/make/hotspot_version" 122 !include "$(WorkSpace)/make/hotspot_version"
123 123
223 223
224 !endif # ! "$(BUILD_WIN_SA)" != "1" 224 !endif # ! "$(BUILD_WIN_SA)" != "1"
225 225
226 ######################################################################### 226 #########################################################################
227 227
228 # With the jvm_g.dll now being named jvm.dll, we can't build both and place
229 # the dll's in the same directory, so we only build one at a time,
230 # re-directing the output to different output directories (done by user
231 # of this makefile).
232 #
233 defaultTarget: product 228 defaultTarget: product
234 229
235 # The product or release build is an optimized build, and is the default 230 # The product or release build is an optimized build, and is the default
236 231
237 # note that since all the build targets depend on local.make that BUILDARCH 232 # note that since all the build targets depend on local.make that BUILDARCH