Mercurial > hg > truffle

comparison make/defs.make @ 6858:b261523fe66c hs25-b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author amurillo
date Fri, 12 Oct 2012 13:55:52 -0700
parents fb19af007ffc
children ed3fa3ae7b61 98f3af397705
comparison
equal deleted inserted replaced
6829:0cc77f9b31ad 6858:b261523fe66c
20 # or visit www.oracle.com if you need additional information or have any 20 # or visit www.oracle.com if you need additional information or have any
21 # questions. 21 # questions.
22 # 22 #
23 # 23 #
24 24
25 # The common definitions for hotspot builds.
26
27 # Optionally include SPEC file generated by configure.
28 ifneq ($(SPEC),)
29 include $(SPEC)
30 endif
31
32 # Directory paths and user name
33 # Unless GAMMADIR is set on the command line, search upward from
34 # the current directory for a parent directory containing "src/share/vm".
35 # If that fails, look for $GAMMADIR in the environment.
36 # When the tree of subdirs is built, this setting is stored in each flags.make.
37 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
38 HS_SRC_DIR=$(GAMMADIR)/src
39 HS_MAKE_DIR=$(GAMMADIR)/make
40 HS_BUILD_DIR=$(GAMMADIR)/build
41
42 ifeq ($(USER),)
43 USER=$(USERNAME)
44 endif
45
25 ifeq ($(HS_ALT_MAKE),) 46 ifeq ($(HS_ALT_MAKE),)
26 ifneq ($(OPENJDK),true) 47 ifneq ($(OPENJDK),true)
27 HS_ALT_MAKE=$(GAMMADIR)/make/closed 48 HS_ALT_MAKE=$(GAMMADIR)/make/closed
28 else 49 else
29 HS_ALT_MAKE=NO_SUCH_PATH 50 HS_ALT_MAKE=NO_SUCH_PATH
30 endif 51 endif
31 endif 52 endif
32 53
33 # The common definitions for hotspot builds. 54 #
34 55 # Include alternate defs.make if it exists
35 # Optionally include SPEC file generated by configure. 56 #
36 ifneq ($(SPEC),) 57 -include $(HS_ALT_MAKE)/defs.make
37 include $(SPEC)
38 endif
39 58
40 # Default to verbose build logs (show all compile lines): 59 # Default to verbose build logs (show all compile lines):
41 MAKE_VERBOSE=y 60 MAKE_VERBOSE=y
42 61
43 # Make macros for install files or preparing targets 62 # Make macros for install files or preparing targets
80 JVM_VARIANTS:=client 99 JVM_VARIANTS:=client
81 JVM_VARIANT_CLIENT:=true 100 JVM_VARIANT_CLIENT:=true
82 endif 101 endif
83 # Further defaults are platform and arch specific 102 # Further defaults are platform and arch specific
84 endif 103 endif
85 endif
86
87 # Directory paths and user name
88 # Unless GAMMADIR is set on the command line, search upward from
89 # the current directory for a parent directory containing "src/share/vm".
90 # If that fails, look for $GAMMADIR in the environment.
91 # When the tree of subdirs is built, this setting is stored in each flags.make.
92 GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
93 HS_SRC_DIR=$(GAMMADIR)/src
94 HS_MAKE_DIR=$(GAMMADIR)/make
95 HS_BUILD_DIR=$(GAMMADIR)/build
96
97 ifeq ($(USER),)
98 USER=$(USERNAME)
99 endif 104 endif
100 105
101 # hotspot version definitions 106 # hotspot version definitions
102 include $(GAMMADIR)/make/hotspot_version 107 include $(GAMMADIR)/make/hotspot_version
103 108
337 342
338 ifndef JAVASE_EMBEDDED 343 ifndef JAVASE_EMBEDDED
339 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h 344 EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
340 endif 345 endif
341 346
347 .PHONY: $(HS_ALT_MAKE)/defs.make