6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
Reviewed-by: dholmes, chegar
--- a/corba/makefiles/BuildCorba.gmk Sun Oct 13 22:00:30 2013 +0100
+++ b/corba/makefiles/BuildCorba.gmk Wed Oct 16 13:49:59 2013 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,8 @@
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
JVM:=$(JAVA),\
JAVAC:=$(NEW_JAVAC),\
- FLAGS:=$(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_CORBA_WARNINGS),\
+ FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR) \
+ $(DISABLE_CORBA_WARNINGS), \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -181,6 +182,15 @@
COPY:=.prp LogStrings.properties,\
BIN:=$(CORBA_OUTPUTDIR)/classes))
+ $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \
+ SETUP := GENERATE_OLDBYTECODE, \
+ SRC := $(BUILD_CORBA_SRC), \
+ EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
+ EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
+ COPY := $(BUILD_CORBA_COPY), \
+ BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \
+ JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar))
+
# Separate src.zip call to include sources that were excluded in the build to
# mimic behavior in old build system.
$(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA,\
@@ -239,6 +249,7 @@
all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
$(CORBA_OUTPUTDIR)/btjars/idlj.jar \
$(CORBA_OUTPUTDIR)/btjars/logutil.jar \
+ $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \
$(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
$(CORBA_OUTPUTDIR)/dist/lib/src.zip \
$(CORBA_OUTPUTDIR)/dist/lib/bin.zip