make/defs.make
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File
hotspot-npg Cdiff make/defs.make
make/defs.make
Print this page
*** 20,43 ****
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
ifeq ($(HS_ALT_MAKE),)
ifneq ($(OPENJDK),true)
HS_ALT_MAKE=$(GAMMADIR)/make/closed
else
HS_ALT_MAKE=NO_SUCH_PATH
endif
endif
! # The common definitions for hotspot builds.
!
! # Optionally include SPEC file generated by configure.
! ifneq ($(SPEC),)
! include $(SPEC)
! endif
# Default to verbose build logs (show all compile lines):
MAKE_VERBOSE=y
# Make macros for install files or preparing targets
--- 20,58 ----
# or visit www.oracle.com if you need additional information or have any
# questions.
#
#
+ # The common definitions for hotspot builds.
+
+ # Optionally include SPEC file generated by configure.
+ ifneq ($(SPEC),)
+ include $(SPEC)
+ endif
+
+ # Directory paths and user name
+ # Unless GAMMADIR is set on the command line, search upward from
+ # the current directory for a parent directory containing "src/share/vm".
+ # If that fails, look for $GAMMADIR in the environment.
+ # When the tree of subdirs is built, this setting is stored in each flags.make.
+ GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
+ HS_SRC_DIR=$(GAMMADIR)/src
+ HS_MAKE_DIR=$(GAMMADIR)/make
+ HS_BUILD_DIR=$(GAMMADIR)/build
+
ifeq ($(HS_ALT_MAKE),)
ifneq ($(OPENJDK),true)
HS_ALT_MAKE=$(GAMMADIR)/make/closed
else
HS_ALT_MAKE=NO_SUCH_PATH
endif
endif
! #
! # Include alternate defs.make if it exists
! #
! -include $(HS_ALT_MAKE)/defs.make
# Default to verbose build logs (show all compile lines):
MAKE_VERBOSE=y
# Make macros for install files or preparing targets
*** 82,101 ****
endif
# Further defaults are platform and arch specific
endif
endif
- # Directory paths and user name
- # Unless GAMMADIR is set on the command line, search upward from
- # the current directory for a parent directory containing "src/share/vm".
- # If that fails, look for $GAMMADIR in the environment.
- # When the tree of subdirs is built, this setting is stored in each flags.make.
- GAMMADIR := $(shell until ([ -d dev ]&&echo $${GAMMADIR:-/GAMMADIR/}) || ([ -d src/share/vm ]&&pwd); do cd ..; done)
- HS_SRC_DIR=$(GAMMADIR)/src
- HS_MAKE_DIR=$(GAMMADIR)/make
- HS_BUILD_DIR=$(GAMMADIR)/build
-
ifeq ($(USER),)
USER=$(USERNAME)
endif
# hotspot version definitions
--- 97,106 ----
*** 334,338 ****
--- 339,344 ----
ifndef JAVASE_EMBEDDED
EXPORT_LIST += $(EXPORT_INCLUDE_DIR)/jfr.h
endif
+ .PHONY: $(HS_ALT_MAKE)/defs.make
make/defs.make
Index
Unified diffs
Context diffs
Sdiffs
Wdiffs
Patch
New
Old
Previous File
Next File