Mercurial > hg > graal-jvmci-8
comparison make/jvmci.make @ 22394:528eeeca785e
Merge.
author | Roland Schatz <roland.schatz@oracle.com> |
---|---|
date | Wed, 29 Jul 2015 10:36:54 +0200 |
parents | f114acdecf70 1884fa0c912e |
children | 4f6caa445b92 |
comparison
equal
deleted
inserted
replaced
22335:8217ef77a80a | 22394:528eeeca785e |
---|---|
143 JVMCI_API_SRC = $(shell find jvmci/jdk.internal.jvmci.meta/src -type f 2> /dev/null) | 143 JVMCI_API_SRC = $(shell find jvmci/jdk.internal.jvmci.meta/src -type f 2> /dev/null) |
144 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.code/src -type f 2> /dev/null) | 144 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.code/src -type f 2> /dev/null) |
145 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.runtime/src -type f 2> /dev/null) | 145 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.runtime/src -type f 2> /dev/null) |
146 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.common/src -type f 2> /dev/null) | 146 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.common/src -type f 2> /dev/null) |
147 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null) | 147 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null) |
148 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.debug/src -type f 2> /dev/null) | |
149 | 148 |
150 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar | 149 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar |
151 | 150 |
152 JVMCI_API_DEP_JARS = $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-service.jar | 151 JVMCI_API_DEP_JARS = $(TARGET)/jvmci-options.jar $(TARGET)/jvmci-service.jar |
153 | 152 |