aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-05 18:31:18 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-05 18:31:18 -0700
commitdad74e0d397ffc103e1aa53b99c1399f32b07fc2 (patch)
tree72f1b682144a62e90007d5c1e966a559834a1b37
parent98665d3a9ac77f0acfd57c5a09136451305f01db (diff)
disable memory init for now
-rwxr-xr-xemcc2
-rwxr-xr-xtests/runner.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/emcc b/emcc
index df6e649f..1d285cbb 100755
--- a/emcc
+++ b/emcc
@@ -721,7 +721,7 @@ try:
bind = False
jcache = False
save_bc = False
- memory_init_file = True
+ memory_init_file = False # XXX TODO True
if use_cxx:
default_cxx_std = '-std=c++03' # Enforce a consistent C++ standard when compiling .cpp files, if user does not specify one on the cmdline.
diff --git a/tests/runner.py b/tests/runner.py
index 3606ff1d..428a7483 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -266,7 +266,7 @@ process(sys.argv[1])
if output_processor is not None:
output_processor(open(filename + '.o.js').read())
- if self.emcc_args is not None:
+ if 0:# XXX TODO self.emcc_args is not None:
if '--memory-init-file' in self.emcc_args:
memory_init_file = int(self.emcc_args[self.emcc_args.index('--memory-init-file')+1])
else: