equal
deleted
inserted
replaced
648 |
648 |
649 $(JAVA_TARGETS): interim-langtools |
649 $(JAVA_TARGETS): interim-langtools |
650 |
650 |
651 # Declare dependencies between hotspot-<variant>* targets |
651 # Declare dependencies between hotspot-<variant>* targets |
652 $(foreach v, $(JVM_VARIANTS), \ |
652 $(foreach v, $(JVM_VARIANTS), \ |
653 $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \ |
|
654 $(eval hotspot-$v-gensrc: java.base-copy) \ |
653 $(eval hotspot-$v-gensrc: java.base-copy) \ |
655 $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \ |
654 $(eval hotspot-$v-libs: hotspot-$v-gensrc java.base-copy) \ |
656 ) |
655 ) |
657 |
656 |
658 hotspot-ide-project: hotspot exploded-image |
657 hotspot-ide-project: hotspot exploded-image |
941 # If not already set, set the JVM specific tools targets |
940 # If not already set, set the JVM specific tools targets |
942 JVM_TOOLS_TARGETS ?= buildtools-hotspot |
941 JVM_TOOLS_TARGETS ?= buildtools-hotspot |
943 buildtools: buildtools-langtools interim-langtools interim-rmic \ |
942 buildtools: buildtools-langtools interim-langtools interim-rmic \ |
944 buildtools-jdk $(JVM_TOOLS_TARGETS) |
943 buildtools-jdk $(JVM_TOOLS_TARGETS) |
945 |
944 |
|
945 # Declare dependencies from hotspot-<variant> targets |
|
946 $(foreach v, $(JVM_VARIANTS), \ |
|
947 $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \ |
|
948 ) |
946 hotspot: $(HOTSPOT_VARIANT_TARGETS) |
949 hotspot: $(HOTSPOT_VARIANT_TARGETS) |
947 |
950 |
948 # Create targets hotspot-libs and hotspot-gensrc. |
951 # Create targets hotspot-libs and hotspot-gensrc. |
949 $(foreach v, $(JVM_VARIANTS), \ |
952 $(foreach v, $(JVM_VARIANTS), \ |
950 $(eval hotspot-libs: hotspot-$v-libs) \ |
953 $(eval hotspot-libs: hotspot-$v-libs) \ |