Mercurial > hg > jdk9-shenandoah
changeset 1603:cf76386db5c7
Merge
author | amurillo |
---|---|
date | Tue, 04 Aug 2015 10:59:30 -0700 |
parents | f47ccd58ac92 (current diff) a74d1574da34 (diff) |
children | 7972dc8f2a47 |
files | |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Main.gmk Fri Jul 31 10:15:01 2015 -0700 +++ b/make/Main.gmk Tue Aug 04 10:59:30 2015 -0700 @@ -78,11 +78,14 @@ interim-rmic: +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk) +interim-cldrconverter: + +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk) + buildtools-jdk: +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools) ALL_TARGETS += buildtools-langtools interim-langtools interim-corba \ - interim-rmic buildtools-jdk + interim-rmic interim-cldrconverter buildtools-jdk ################################################################################ # Special targets for certain modules @@ -345,7 +348,7 @@ interim-langtools: $(LANGTOOLS_GENSRC_TARGETS) - buildtools-jdk: interim-langtools + buildtools-jdk: interim-langtools interim-cldrconverter $(CORBA_GENSRC_TARGETS): interim-langtools