35 else
  36   JAVA_EXEC_POS=1
  37 endif
  38 ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
  39   $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
  40 endif
  41 
  42 
  43 # Override specific values to do a boot cycle build
  44 
  45 # Use a different Boot JDK
  46 BOOT_JDK := $(JDK_IMAGE_DIR)
  47 
  48 # The bootcycle build has a different output directory
  49 OLD_OUTPUTDIR:=@OUTPUTDIR@
  50 OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build
  51 SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_DIR))
  52 
  53 JAVA_CMD:=$(BOOT_JDK)/bin/java
  54 JAVAC_CMD:=$(BOOT_JDK)/bin/javac
  55 JAVAH_CMD:=$(BOOT_JDK)/bin/javah
  56 JAR_CMD:=$(BOOT_JDK)/bin/jar
  57 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
  58 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
  59 # When building a 32bit target, make sure the sjavac server flags are compatible
  60 # with a 32bit JVM.
  61 ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
  62   SJAVAC_SERVER_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
  63 endif
  64 # The bootcycle JVM arguments may differ from the original boot jdk.
  65 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@

  35 else
  36   JAVA_EXEC_POS=1
  37 endif
  38 ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
  39   $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
  40 endif
  41 
  42 
  43 # Override specific values to do a boot cycle build
  44 
  45 # Use a different Boot JDK
  46 BOOT_JDK := $(JDK_IMAGE_DIR)
  47 
  48 # The bootcycle build has a different output directory
  49 OLD_OUTPUTDIR:=@OUTPUTDIR@
  50 OUTPUTDIR:=$(OLD_OUTPUTDIR)/bootcycle-build
  51 SJAVAC_SERVER_DIR:=$(patsubst $(OLD_OUTPUTDIR)%, $(OUTPUTDIR)%, $(SJAVAC_SERVER_DIR))
  52 
  53 JAVA_CMD:=$(BOOT_JDK)/bin/java
  54 JAVAC_CMD:=$(BOOT_JDK)/bin/javac

  55 JAR_CMD:=$(BOOT_JDK)/bin/jar
  56 JARSIGNER_CMD:=$(BOOT_JDK)/bin/jarsigner
  57 SJAVAC_SERVER_JAVA_CMD:=$(JAVA_CMD)
  58 # When building a 32bit target, make sure the sjavac server flags are compatible
  59 # with a 32bit JVM.
  60 ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
  61   SJAVAC_SERVER_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
  62 endif
  63 # The bootcycle JVM arguments may differ from the original boot jdk.
  64 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@