[Truffle] Mx: use the build pack if it is in the current directory

jruby · Oct 13, 2016 · 57da93a · 57da93a
1 parent 5649c1a
commit 57da93a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mx.jruby/mx_jruby.py b/mx.jruby/mx_jruby.py
@@ -16,7 +16,7 @@
 import tarfile
 import zipfile
 from threading import Thread
-from os.path import join, exists
+from os.path import join, exists, isdir
 
 import mx
 import mx_benchmark
@@ -109,7 +109,8 @@ def clean(self, forBuild=False):
         pass
 
 def mavenSetup():
-    mavenDir = join(_suite.dir, 'mxbuild', 'mvn')
+    buildPack = join(_suite.dir, 'jruby-build-pack')
+    mavenDir = buildPack if isdir(buildPack) else join(_suite.dir, 'mxbuild/mvn')
     maven_repo_arg = '-Dmaven.repo.local=' + mavenDir
     env = os.environ.copy()
     env['JRUBY_BUILD_MORE_QUIET'] = 'true'