Mercurial > hg > graal-jvmci-8
comparison make/jvmci.make @ 22315:697b6b4a7f57
merge fixes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 24 Jul 2015 08:22:19 +0200 |
parents | 2c87ecb88c81 |
children | f114acdecf70 |
comparison
equal
deleted
inserted
replaced
22314:cd04ef3c7c49 | 22315:697b6b4a7f57 |
---|---|
136 JVMCI_API_SRC = $(shell find jvmci/jdk.internal.jvmci.meta/src -type f 2> /dev/null) | 136 JVMCI_API_SRC = $(shell find jvmci/jdk.internal.jvmci.meta/src -type f 2> /dev/null) |
137 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.code/src -type f 2> /dev/null) | 137 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.code/src -type f 2> /dev/null) |
138 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.runtime/src -type f 2> /dev/null) | 138 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.runtime/src -type f 2> /dev/null) |
139 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.options/src -type f 2> /dev/null) | 139 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.options/src -type f 2> /dev/null) |
140 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.common/src -type f 2> /dev/null) | 140 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.common/src -type f 2> /dev/null) |
141 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null) | |
141 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.debug/src -type f 2> /dev/null) | 142 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.debug/src -type f 2> /dev/null) |
142 JVMCI_API_SRC += $(shell find jvmci/jdk.internal.jvmci.compiler/src -type f 2> /dev/null) | |
143 | 143 |
144 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar | 144 JVMCI_API_JAR = $(TARGET)/jvmci-api.jar |
145 | 145 |
146 JVMCI_API_DEP_JARS = $(TARGET)/jvmci-service.jar | 146 JVMCI_API_DEP_JARS = $(TARGET)/jvmci-service.jar |
147 | 147 |