Mercurial > hg > graal-compiler

comparison make/windows/makefiles/defs.make @ 427:3c07cda72b7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6764892: VS2008 changes required to compile hotspot sources Summary: Minor changes required to build using the Visual Studio 2008 compiler Reviewed-by: kvn, ohair
author tbell
date Tue, 11 Nov 2008 22:01:08 -0800
parents 818a18cd69a8
children b6272ef4a18f
comparison
equal deleted inserted replaced
421:577f3a2e0662 427:3c07cda72b7d
23 # 23 #
24 24
25 # The common definitions for hotspot windows builds. 25 # The common definitions for hotspot windows builds.
26 # Include the top level defs.make under make directory instead of this one. 26 # Include the top level defs.make under make directory instead of this one.
27 # This file is included into make/defs.make. 27 # This file is included into make/defs.make.
28 # On windows it is only used to construct parameters for 28 # On windows it is only used to construct parameters for
29 # make/windows/build.make when make/Makefile is used to build VM. 29 # make/windows/build.make when make/Makefile is used to build VM.
30 30
31 SLASH_JAVA ?= J: 31 SLASH_JAVA ?= J:
32 PATH_SEP = ; 32 PATH_SEP = ;
33 33
67 MAKE_ARGS += Platform_arch_model=x86_64 67 MAKE_ARGS += Platform_arch_model=x86_64
68 endif 68 endif
69 69
70 JDK_INCLUDE_SUBDIR=win32 70 JDK_INCLUDE_SUBDIR=win32
71 71
72 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined 72 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
73 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make. 73 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
74 74
75 # next parameters are defined in $(GAMMADIR)/make/defs.make. 75 # next parameters are defined in $(GAMMADIR)/make/defs.make.
76 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) 76 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION)
77 MAKE_ARGS += JDK_MAJOR_VER=$(JDK_MAJOR_VERSION) 77 MAKE_ARGS += JDK_MAJOR_VER=$(JDK_MAJOR_VERSION)
123 ifneq ($(ALT_BUILD_WIN_SA),) 123 ifneq ($(ALT_BUILD_WIN_SA),)
124 BUILD_WIN_SA = $(ALT_BUILD_WIN_SA) 124 BUILD_WIN_SA = $(ALT_BUILD_WIN_SA)
125 endif 125 endif
126 126
127 ifeq ($(BUILD_WIN_SA), 1) 127 ifeq ($(BUILD_WIN_SA), 1)
128 ifeq ($(ARCH),ia64) 128 ifeq ($(ARCH),ia64)
129 BUILD_WIN_SA = 0 129 BUILD_WIN_SA = 0
130 endif 130 endif
131 endif 131 endif
132 132
133 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server 133 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
152 152
153 ifeq ($(BUILD_WIN_SA), 1) 153 ifeq ($(BUILD_WIN_SA), 1)
154 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll 154 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll
155 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb 155 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
156 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map 156 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
157 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 157 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
158 # Must pass this down to nmake. 158 # Must pass this down to nmake.
159 MAKE_ARGS += BUILD_WIN_SA=1 159 MAKE_ARGS += BUILD_WIN_SA=1
160 endif 160 endif