Mercurial > jdk8-mips64-public / file comparison
comparison: common/autoconf/bootcycle-spec.gmk.in
common/autoconf/bootcycle-spec.gmk.in
- changeset 668
- 52d1b385a4ed
- parent 478
- 2ba6f4da4bf3
- child 839
- 174a54ce39c4
equal
deleted
inserted
replaced
| 666:01f631f89fa3 | 668:52d1b385a4ed |
|---|---|
| 27 | 27 |
| 28 # First include the real base spec.gmk file | 28 # First include the real base spec.gmk file |
| 29 include @SPEC@ | 29 include @SPEC@ |
| 30 | 30 |
| 31 # Check that the user did not try to specify a different java to use for compiling. | 31 # Check that the user did not try to specify a different java to use for compiling. |
| 32 ifneq ($(firstword $(SJAVAC_SERVER_JAVA)),$(firstword $(JAVA))) | 32 # On windows we need to account for fixpath being first word. |
| 33 $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified) | 33 ifeq ($(firstword $(JAVA)),$(FIXPATH)) |
| 34 JAVA_EXEC_POS=2 | |
| 35 else | |
| 36 JAVA_EXEC_POS=1 | |
| 34 endif | 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 | |
| 35 | 42 |
| 36 # Override specific values to do a boot cycle build | 43 # Override specific values to do a boot cycle build |
| 37 | 44 |
| 38 # The bootcycle build has a different output directory | 45 # The bootcycle build has a different output directory |
| 39 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build | 46 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build |
| 40 | 47 |
| 41 # Use a different Boot JDK | 48 # Use a different Boot JDK |
| 49 OLD_BOOT_JDK:=$(BOOT_JDK) | |
| 42 BOOT_JDK:=@BUILD_OUTPUT@/images/j2sdk-image | 50 BOOT_JDK:=@BUILD_OUTPUT@/images/j2sdk-image |
| 43 BOOT_RTJAR:=@BUILD_OUTPUT@/images/j2sdk-image/jre/lib/rt.jar | 51 BOOT_RTJAR:=@BUILD_OUTPUT@/images/j2sdk-image/jre/lib/rt.jar |
| 52 | |
| 53 SJAVAC_SERVER_JAVA:=$(subst $(OLD_BOOT_JDK),$(BOOT_JDK),$(SJAVAC_SERVER_JAVA)) |
