aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--settings.py2
-rw-r--r--tools/shared.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/settings.py b/settings.py
index 0b19fd28..48eaa9ab 100644
--- a/settings.py
+++ b/settings.py
@@ -10,8 +10,6 @@ NODE_JS = 'node'
SPIDERMONKEY_ENGINE = [os.path.expanduser('~/Dev/mozilla-central/js/src/js'), '-m', '-n']
V8_ENGINE = os.path.expanduser('~/Dev/v8/d8')
-CLOSURE_COMPILER = os.path.join(EMSCRIPTEN_ROOT, 'third_party', 'closure-compiler', 'compiler.jar')
-
TEMP_DIR = '/tmp'
diff --git a/tools/shared.py b/tools/shared.py
index fd51282b..7570473c 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -139,6 +139,11 @@ except:
print 'ERROR: %s does not seem to have JS_ENGINES or JS_ENGINE set up' % EM_CONFIG
raise
+try:
+ CLOSURE_COMPILER
+except:
+ CLOSURE_COMPILER = path_from_root('third_party', 'closure-compiler', 'compiler.jar')
+
# Additional compiler options
try: