Delete the compiled relooper.js (but allow specification of an arbitrary relooper)

3 files changed, 6 insertions, 1 deletions

diff --git a/emscripten.py b/emscripten.py
index 1ea6e0d7..2ada0b0d 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -624,6 +624,9 @@ WARNING: You should normally never use this! Use emcc instead.
   keywords.infile = os.path.abspath(positional[0])
   if isinstance(keywords.outfile, basestring):
     keywords.outfile = open(keywords.outfile, 'w')
+  if keywords.relooper:
+    shared.RELOOPER = os.path.abspath(keywords.relooper)
+    keywords.settings.append("RELOOPER=" + json.dumps(shared.RELOOPER))
 
   global compiler_engine
   compiler_engine = keywords.compiler
diff --git a/src/compiler.js b/src/compiler.js
index 1cd09c30..3047daf1 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -199,7 +199,7 @@ load('parseTools.js');
 load('intertyper.js');
 load('analyzer.js');
 load('jsifier.js');
-if (RELOOP) load('relooper.js')
+if (RELOOP) load(RELOOPER)
 globalEval(processMacros(preprocess(read('runtime.js'))));
 Runtime.QUANTUM_SIZE = QUANTUM_SIZE;
 
diff --git a/src/settings.js b/src/settings.js
index e260ed2a..1bfcf92a 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -58,6 +58,8 @@ var ALLOW_MEMORY_GROWTH = 0; // If false, we abort with an error if we try to al
 // Code embetterments
 var MICRO_OPTS = 1; // Various micro-optimizations, like nativizing variables
 var RELOOP = 0; // Recreate js native loops from llvm data
+var RELOOPER = 'relooper.js'; // Loads the relooper from this path relative to compiler.js
+
 var USE_TYPED_ARRAYS = 2; // Use typed arrays for the heap. See https://github.com/kripken/emscripten/wiki/Code-Generation-Modes/
                           // 0 means no typed arrays are used.
                           // 1 has two heaps, IHEAP (int32) and FHEAP (double),