Mercurial > hg > graal-jvmci-8

diff mx.jvmci/mx_jvmci_makefile.py @ 22325:f114acdecf70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update jvmci.make
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 24 Jul 2015 15:21:27 +0200
parents 26e2a05f8d95
children 4f6caa445b92
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci_makefile.py	Fri Jul 24 15:22:31 2015 +0200
+++ b/mx.jvmci/mx_jvmci_makefile.py	Fri Jul 24 15:21:27 2015 +0200
@@ -95,9 +95,11 @@
     sourceLines = sourcesVariableName + " = " + ("\n" + sourcesVariableName + " += ").join(sources)
     apDistNames = []
     apDistVariableNames = []
+    apDependencies = []
     for apd in sorted(annotationProcessorDeps):
         apDistNames.append(apd.name)
         apDistVariableNames.append("$(" + apd.name + "_JAR)")
+        apDependencies.append("$(subst  $(space),:,$(" + apd.name + "_DEP_JARS))")
     shouldExport = dist in jdkDeployedDists
     props = {
            "name": dist.name,
@@ -107,7 +109,7 @@
            "sourceLines": sourceLines,
            "sourcesVariableName": sourcesVariableName,
            "annotationProcessors": " ".join(apDistVariableNames),
-           "cpAnnotationProcessors": ":".join(apDistVariableNames),
+           "cpAnnotationProcessors": ":".join(apDistVariableNames + apDependencies),
            "jarDeps": " ".join(classPath),
            "copyResources": " ".join(resources)
            }