comparison make/defs.make @ 6152:958bb4b7be49

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents 3d7ea1dbe0de
children a9fed06c01d2
comparison
equal deleted inserted replaced
6151:e778c29768e6 6152:958bb4b7be49
1 # 1 #
2 # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 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 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # The common definitions for hotspot builds. 25 # The common definitions for hotspot builds.
26
27 # Optionally include SPEC file generated by configure.
28 ifneq ($(SPEC),)
29 include $(SPEC)
30 endif
26 31
27 # Default to verbose build logs (show all compile lines): 32 # Default to verbose build logs (show all compile lines):
28 MAKE_VERBOSE=y 33 MAKE_VERBOSE=y
29 34
30 # Make macros for install files or preparing targets 35 # Make macros for install files or preparing targets
48 define prep-target 53 define prep-target
49 @$(MKDIR) -p $(@D) 54 @$(MKDIR) -p $(@D)
50 @$(RM) $@ 55 @$(RM) $@
51 endef 56 endef
52 57
58 # Default values for JVM_VARIANT* variables if configure hasn't set
59 # it already.
60 ifeq ($(JVM_VARIANTS),)
61 ifeq ($(ZERO_BUILD), true)
62 ifeq ($(SHARK_BUILD), true)
63 JVM_VARIANTS:=zeroshark
64 JVM_VARIANT_ZEROSHARK:=true
65 else
66 JVM_VARIANTS:=zero
67 JVM_VARIANT_ZERO:=true
68 endif
69 else
70 # A default is needed
71 ifeq ($(BUILD_CLIENT_ONLY), true)
72 JVM_VARIANTS:=client
73 JVM_VARIANT_CLIENT:=true
74 endif
75 # Further defaults are platform and arch specific
76 endif
77 endif
78
53 # Directory paths and user name 79 # Directory paths and user name
54 # Unless GAMMADIR is set on the command line, search upward from 80 # Unless GAMMADIR is set on the command line, search upward from
55 # the current directory for a parent directory containing "src/share/vm". 81 # the current directory for a parent directory containing "src/share/vm".
56 # If that fails, look for $GAMMADIR in the environment. 82 # If that fails, look for $GAMMADIR in the environment.
57 # When the tree of subdirs is built, this setting is stored in each flags.make. 83 # When the tree of subdirs is built, this setting is stored in each flags.make.
181 207
182 # Find JDK used for javac compiles 208 # Find JDK used for javac compiles
183 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM) 209 BOOTDIR=$(SLASH_JAVA)/re/j2se/$(PREVIOUS_JDK_VERSION)/latest/binaries/$(PLATFORM)
184 ifneq ($(ALT_BOOTDIR),) 210 ifneq ($(ALT_BOOTDIR),)
185 BOOTDIR=$(ALT_BOOTDIR) 211 BOOTDIR=$(ALT_BOOTDIR)
212 endif
213
214 # Select name of the export directory and honor ALT overrides
215 EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
216 ifneq ($(ALT_EXPORT_PATH),)
217 EXPORT_PATH=$(ALT_EXPORT_PATH)
218 endif
219
220 # Default jdk image if one is created for you with create_jdk
221 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
222 ifneq ($(ALT_JDK_IMAGE_DIR),)
223 JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
186 endif 224 endif
187 225
188 # The platform dependent defs.make defines platform specific variable such 226 # The platform dependent defs.make defines platform specific variable such
189 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined. 227 # as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
190 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make 228 include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
261 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile 299 # Pass HOTSPOT_BUILD_VERSION as argument to OS specific Makefile
262 # to overwrite the default definition since OS specific Makefile also 300 # to overwrite the default definition since OS specific Makefile also
263 # includes this make/defs.make file. 301 # includes this make/defs.make file.
264 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) 302 MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION)
265 303
266 # Select name of export directory
267 EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
268 ifneq ($(ALT_EXPORT_PATH),)
269 EXPORT_PATH=$(ALT_EXPORT_PATH)
270 endif
271
272 # Default jdk image if one is created for you with create_jdk
273 JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
274
275 # Various export sub directories 304 # Various export sub directories
276 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include 305 EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include
277 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs 306 EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs
278 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib 307 EXPORT_LIB_DIR = $(EXPORT_PATH)/lib
279 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre 308 EXPORT_JRE_DIR = $(EXPORT_PATH)/jre