require JAVA definition in ~/.emscripten

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/shared.py b/tools/shared.py
index 69343cc2..30de8685 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -81,9 +81,9 @@ def check_sanity(force=False):
         sys.exit(0)
 
     try:
-      subprocess.call(['java', '-version'], stdout=PIPE, stderr=PIPE)
+      subprocess.call([JAVA, '-version'], stdout=PIPE, stderr=PIPE)
     except:
-      print >> sys.stderr, 'WARNING: java does not seem to exist, required for closure compiler. -O2 and above will fail.'
+      print >> sys.stderr, 'WARNING: java does not seem to exist, required for closure compiler. -O2 and above will fail. You need to define JAVA in ~/.emscripten (see settings.py)'
 
     if not os.path.exists(CLOSURE_COMPILER):
       print >> sys.stderr, 'WARNING: Closure compiler (%s) does not exist, check the paths in %s. -O2 and above will fail' % (CLOSURE_COMPILER, EM_CONFIG)
@@ -830,7 +830,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
 
     # Something like this (adjust memory as needed):
     #   java -Xmx1024m -jar CLOSURE_COMPILER --compilation_level ADVANCED_OPTIMIZATIONS --variable_map_output_file src.cpp.o.js.vars --js src.cpp.o.js --js_output_file src.cpp.o.cc.js
-    args = ['java',
+    args = [JAVA,
             '-Xmx1024m',
             '-jar', CLOSURE_COMPILER,
             '--compilation_level', 'ADVANCED_OPTIMIZATIONS',