changeset 1304:29c2657f7561

Merge
author chegar
date Mon, 17 Nov 2014 16:38:26 +0000
parents 612f3744a974 ae8b835ca6de
children 7ec2be25e81e
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/spec.gmk.in	Mon Nov 17 16:38:09 2014 +0000
+++ b/common/autoconf/spec.gmk.in	Mon Nov 17 16:38:26 2014 +0000
@@ -478,13 +478,14 @@
 JAVAC_FLAGS?=@JAVAC_FLAGS@
 
 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
-INTERIM_LANGTOOLS_JAR := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools.jar
-INTERIM_LANGTOOLS_ARGS := "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR)
+# Use = assignment to be able to override in bootcycle-spec.gmk
+INTERIM_LANGTOOLS_JAR = $(BUILDTOOLS_OUTPUTDIR)/interim_langtools.jar
+INTERIM_LANGTOOLS_ARGS = "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR)
 NEW_JAVAC   = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main
 NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javadoc.Main
 
 # The interim corba jar is needed for running rmic
-INTERIM_CORBA_JAR := $(BUILDTOOLS_OUTPUTDIR)/interim_corba.jar
+INTERIM_CORBA_JAR = $(BUILDTOOLS_OUTPUTDIR)/interim_corba.jar
 
 # Base flags for RC
 # Guarding this against resetting value. Legacy make files include spec multiple
--- a/make/MakeHelpers.gmk	Mon Nov 17 16:38:09 2014 +0000
+++ b/make/MakeHelpers.gmk	Mon Nov 17 16:38:26 2014 +0000
@@ -428,7 +428,7 @@
   $$(foreach m, $$($(strip $1)_CHECK_MODULES), \
       $$(eval $$(call DeclareRecipesForPhaseAndModule,$(strip $1),$$m)))
 
-  $1_TARGETS := $$($(strip $1))
+  $(strip $1)_TARGETS := $$($(strip $1))
 endef
 
 ################################################################################