# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1433288127 -7200
# Node ID 74943b9d532a2246d46aa99230d6a7a99c7404b4
# Parent  902a6399353b96a05c3da493ab46645eca39df48# Parent  7a8a5bb5ec56097f5a2ea799ee4be9361ff0a6cc
Merge.

diff -r 902a6399353b -r 74943b9d532a mx/suite.py
--- a/mx/suite.py	Wed Jun 03 01:11:56 2015 +0200
+++ b/mx/suite.py	Wed Jun 03 01:35:27 2015 +0200
@@ -1141,7 +1141,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : ["com.oracle.truffle.api"],
       "checkstyle" : "com.oracle.truffle.api",
-      "javaCompliance" : "1.8",
+      "javaCompliance" : "1.7",
       "workingSets" : "Truffle,Tools",
     },
 
@@ -1355,6 +1355,7 @@
         "com.oracle.nfi",
         "com.oracle.truffle.interop",
         "com.oracle.truffle.object.basic",
+        "com.oracle.truffle.tools"
       ],
       "distDependencies" : [
         "JVMCI_SERVICE",