equal
deleted
inserted
replaced
264 JVM_VARIANT=$1) |
264 JVM_VARIANT=$1) |
265 endef |
265 endef |
266 |
266 |
267 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v))) |
267 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v))) |
268 |
268 |
269 hotspot-jsig: |
|
270 +($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk) |
|
271 |
|
272 hotspot-ide-project: |
269 hotspot-ide-project: |
273 +($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk) |
270 +($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk) |
274 |
271 |
275 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \ |
272 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \ |
276 $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project |
273 $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-ide-project |
277 |
274 |
278 ################################################################################ |
275 ################################################################################ |
279 # Build demos targets |
276 # Build demos targets |
280 |
277 |
281 demos-jdk: |
278 demos-jdk: |
907 # If not already set, set the JVM specific tools targets |
904 # If not already set, set the JVM specific tools targets |
908 JVM_TOOLS_TARGETS ?= buildtools-hotspot |
905 JVM_TOOLS_TARGETS ?= buildtools-hotspot |
909 buildtools: buildtools-langtools interim-langtools interim-rmic \ |
906 buildtools: buildtools-langtools interim-langtools interim-rmic \ |
910 buildtools-jdk $(JVM_TOOLS_TARGETS) |
907 buildtools-jdk $(JVM_TOOLS_TARGETS) |
911 |
908 |
912 hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig |
909 hotspot: $(HOTSPOT_VARIANT_TARGETS) |
913 |
|
914 hotspot-libs: hotspot-jsig |
|
915 |
910 |
916 # Create targets hotspot-libs and hotspot-gensrc. |
911 # Create targets hotspot-libs and hotspot-gensrc. |
917 $(foreach v, $(JVM_VARIANTS), \ |
912 $(foreach v, $(JVM_VARIANTS), \ |
918 $(eval hotspot-libs: hotspot-$v-libs) \ |
913 $(eval hotspot-libs: hotspot-$v-libs) \ |
919 $(eval hotspot-gensrc: hotspot-$v-gensrc) \ |
914 $(eval hotspot-gensrc: hotspot-$v-gensrc) \ |