diff mx/suite.py @ 20873:c9a8c62c60fc

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 09 Apr 2015 18:56:06 +0200
parents 197d955502b3 b1700db197c7
children 71509cb61f17
line wrap: on
line diff
--- a/mx/suite.py	Thu Apr 09 17:04:05 2015 +0200
+++ b/mx/suite.py	Thu Apr 09 18:56:06 2015 +0200
@@ -329,7 +329,6 @@
         "com.oracle.graal.runtime",
         "com.oracle.graal.printer",
         "com.oracle.graal.hotspotvmconfig",
-        "com.oracle.nfi",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "annotationProcessors" : [
@@ -1093,6 +1092,7 @@
       "dependencies" : [
         "com.oracle.graal.truffle",
         "com.oracle.graal.hotspot",
+        "com.oracle.nfi",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
@@ -1105,7 +1105,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "com.oracle.graal.truffle.hotspot",
-        "com.oracle.graal.asm.amd64",
+        "com.oracle.graal.hotspot.amd64",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",