Skip to content

Commit 6073296

Browse files
committed
8299616: [11u] Bootcycle build fails after JDK-8257679 backport
Reviewed-by: andrew, clanger
1 parent 52737cd commit 6073296

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

make/autoconf/bootcycle-spec.gmk.in

+9-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,19 @@
2828
# First include the real base spec.gmk file
2929
include @SPEC@
3030

31-
# Override specific values to do a boot cycle build
31+
# Check that the user did not try to specify a different java to use for compiling.
32+
# On windows we need to account for fixpath being first word.
33+
ifeq ($(firstword $(JAVA)),$(FIXPATH))
34+
JAVA_EXEC_POS=2
35+
else
36+
JAVA_EXEC_POS=1
37+
endif
3238
ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
3339
$(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
3440
endif
3541

42+
# Override specific values to do a boot cycle build
43+
3644
# Use a different Boot JDK
3745
BOOT_JDK := $(JDK_IMAGE_DIR)
3846

0 commit comments

Comments
 (0)