aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-05-29 11:40:06 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-05-29 11:40:06 -0700
commita6e9973beec114dbf68f0ba481893b3b6650c1fa (patch)
treebb63174f1fb3445b8234b36809879fd1fa14d6b6
parent0b222be053ad17a677938c3156c47842b7389a6d (diff)
fallback to java if no JAVA in ~/.emscripten
-rw-r--r--tools/shared.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 30de8685..85d89010 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -172,6 +172,12 @@ try:
except:
CLOSURE_COMPILER = path_from_root('third_party', 'closure-compiler', 'compiler.jar')
+try:
+ JAVA
+except:
+ print >> sys.stderr, 'JAVA not defined in ~/.emscripten, using "java"'
+ JAVA = 'java'
+
# Additional compiler options
try: