550 endif
551 endif
552 ABS_OUTPUTDIR:=$(call AltCheckSpaces,ABS_OUTPUTDIR)
553 ABS_OUTPUTDIR:=$(call AltCheckValue,ABS_OUTPUTDIR)
554 # Make doubly sure this is a full path
555 ifeq ($(call AbsPwdPathCheck,$(ABS_OUTPUTDIR)), )
556 ifdef ALT_OUTPUTDIR
557 _outputdir_error:=$(error "ERROR: Trouble with the absolute path for OUTPUTDIR '$(OUTPUTDIR)', was ALT_OUTPUTDIR '$(ALT_OUTPUTDIR)' an absolute path?")
558 else
559 _outputdir_error:=$(error "ERROR: Trouble with the absolute path for OUTPUTDIR '$(OUTPUTDIR)'")
560 endif
561 endif
562 _dir1:=$(call FullPath,$(ABS_OUTPUTDIR))
563 _dir2:=$(call FullPath,$(OUTPUTDIR))
564 ifneq ($(_dir1),$(_dir2))
565 _outputdir_error:=$(error "ERROR: ABS_OUTPUTDIR '$(ABS_OUTPUTDIR)' is not the same directory as OUTPUTDIR '$(OUTPUTDIR)', '$(_dir1)'!='$(_dir2)'")
566 endif
567
568 # Bin directory
569 # NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
570 BINDIR = $(OUTPUTDIR)/bin$(ISA_DIR)
571
572 # JDK_HOST_PATH: the default location of the latest JDK that can run
573 # on the host system and supports the target class file version
574 # generated in this JDK build. This variable should only be
575 # used after the launchers are built (i.e. make/launchers).
576 #
577 # By default, it is the OUTPUTDIR. If the target architecture
578 # is different that the host system doing the build (e.g. cross-compilation),
579 # ALT_JDK_HOST_PATH should be set.
580 #
581 ifdef ALT_JDK_HOST_PATH
582 _HOST_VERSION :=$(shell $(ALT_JDK_HOST_PATH)/bin/java -version 2>&1 | $(HEAD) -n 1)
583 ALT_JDK_HOST_PATH_VERSION :=$(call GetVersion,"$(_HOST_VERSION)")
584 ALT_JDK_HOST_PATH_CHECK :=$(call CheckVersions,$(ALT_JDK_HOST_PATH_VERSION),$(JDK_VERSION))
585 JDK_HOST_PATH =$(ALT_JDK_HOST_PATH)
586 JDK_HOST_PATH:=$(call AltCheckSpaces,JDK_HOST_PATH)
587 JDK_HOST_PATH:=$(call AltCheckValue,JDK_HOST_PATH)
588 else
589 JDK_HOST_PATH =$(ABS_OUTPUTDIR)
590 endif
|
550 endif
551 endif
552 ABS_OUTPUTDIR:=$(call AltCheckSpaces,ABS_OUTPUTDIR)
553 ABS_OUTPUTDIR:=$(call AltCheckValue,ABS_OUTPUTDIR)
554 # Make doubly sure this is a full path
555 ifeq ($(call AbsPwdPathCheck,$(ABS_OUTPUTDIR)), )
556 ifdef ALT_OUTPUTDIR
557 _outputdir_error:=$(error "ERROR: Trouble with the absolute path for OUTPUTDIR '$(OUTPUTDIR)', was ALT_OUTPUTDIR '$(ALT_OUTPUTDIR)' an absolute path?")
558 else
559 _outputdir_error:=$(error "ERROR: Trouble with the absolute path for OUTPUTDIR '$(OUTPUTDIR)'")
560 endif
561 endif
562 _dir1:=$(call FullPath,$(ABS_OUTPUTDIR))
563 _dir2:=$(call FullPath,$(OUTPUTDIR))
564 ifneq ($(_dir1),$(_dir2))
565 _outputdir_error:=$(error "ERROR: ABS_OUTPUTDIR '$(ABS_OUTPUTDIR)' is not the same directory as OUTPUTDIR '$(OUTPUTDIR)', '$(_dir1)'!='$(_dir2)'")
566 endif
567
568 # Bin directory
569 # NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
570 ## Temporarily remove for Modules Solaris 64bit only build
571 #BINDIR = $(OUTPUTDIR)/bin$(ISA_DIR)
572 BINDIR = $(OUTPUTDIR)/bin
573
574 # JDK_HOST_PATH: the default location of the latest JDK that can run
575 # on the host system and supports the target class file version
576 # generated in this JDK build. This variable should only be
577 # used after the launchers are built (i.e. make/launchers).
578 #
579 # By default, it is the OUTPUTDIR. If the target architecture
580 # is different that the host system doing the build (e.g. cross-compilation),
581 # ALT_JDK_HOST_PATH should be set.
582 #
583 ifdef ALT_JDK_HOST_PATH
584 _HOST_VERSION :=$(shell $(ALT_JDK_HOST_PATH)/bin/java -version 2>&1 | $(HEAD) -n 1)
585 ALT_JDK_HOST_PATH_VERSION :=$(call GetVersion,"$(_HOST_VERSION)")
586 ALT_JDK_HOST_PATH_CHECK :=$(call CheckVersions,$(ALT_JDK_HOST_PATH_VERSION),$(JDK_VERSION))
587 JDK_HOST_PATH =$(ALT_JDK_HOST_PATH)
588 JDK_HOST_PATH:=$(call AltCheckSpaces,JDK_HOST_PATH)
589 JDK_HOST_PATH:=$(call AltCheckValue,JDK_HOST_PATH)
590 else
591 JDK_HOST_PATH =$(ABS_OUTPUTDIR)
592 endif
|