162 ifeq ($(ARCH_DATA_MODEL), 32)
163 JVM_VARIANTS:=client,server
164 JVM_VARIANT_CLIENT:=true
165 JVM_VARIANT_SERVER:=true
166 else
167 JVM_VARIANTS:=server
168 JVM_VARIANT_SERVER:=true
169 endif
170 endif
171
172 JDK_INCLUDE_SUBDIR=win32
173
174 # Library suffix
175 LIBRARY_SUFFIX=dll
176
177 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
178 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
179
180 # next parameters are defined in $(GAMMADIR)/make/defs.make.
181 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION)
182 MAKE_ARGS += JDK_MAJOR_VER=$(JDK_MAJOR_VERSION)
183 MAKE_ARGS += JDK_MINOR_VER=$(JDK_MINOR_VERSION)
184 MAKE_ARGS += JDK_MICRO_VER=$(JDK_MICRO_VERSION)
185
186 ifdef COOKED_JDK_UPDATE_VERSION
187 MAKE_ARGS += JDK_UPDATE_VER=$(COOKED_JDK_UPDATE_VERSION)
188 endif
189
190 # COOKED_BUILD_NUMBER should only be set if we have a numeric
191 # build number. It must not be zero padded.
192 ifdef COOKED_BUILD_NUMBER
193 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
194 endif
195
196 NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO
197 ifndef SYSTEM_UNAME
198 SYSTEM_UNAME := $(shell uname)
199 export SYSTEM_UNAME
200 endif
201
202 # Check for CYGWIN
203 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
204 USING_CYGWIN=true
|
162 ifeq ($(ARCH_DATA_MODEL), 32)
163 JVM_VARIANTS:=client,server
164 JVM_VARIANT_CLIENT:=true
165 JVM_VARIANT_SERVER:=true
166 else
167 JVM_VARIANTS:=server
168 JVM_VARIANT_SERVER:=true
169 endif
170 endif
171
172 JDK_INCLUDE_SUBDIR=win32
173
174 # Library suffix
175 LIBRARY_SUFFIX=dll
176
177 # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
178 # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
179
180 # next parameters are defined in $(GAMMADIR)/make/defs.make.
181 MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION)
182 MAKE_ARGS += JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION)
183 MAKE_ARGS += JDK_MINOR_VERSION=$(JDK_MINOR_VERSION)
184 MAKE_ARGS += JDK_MICRO_VERSION=$(JDK_MICRO_VERSION)
185
186 ifdef COOKED_JDK_UPDATE_VERSION
187 MAKE_ARGS += JDK_UPDATE_VER=$(COOKED_JDK_UPDATE_VERSION)
188 endif
189
190 # COOKED_BUILD_NUMBER should only be set if we have a numeric
191 # build number. It must not be zero padded.
192 ifdef COOKED_BUILD_NUMBER
193 MAKE_ARGS += JDK_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
194 endif
195
196 NMAKE= MAKEFLAGS= MFLAGS= EXTRA_CFLAGS="$(EXTRA_CFLAGS)" nmake -NOLOGO
197 ifndef SYSTEM_UNAME
198 SYSTEM_UNAME := $(shell uname)
199 export SYSTEM_UNAME
200 endif
201
202 # Check for CYGWIN
203 ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
204 USING_CYGWIN=true
|