minor fixes (emscripten-core#5296)

buu700 · Jun 15, 2017 · e8d5176 · e8d5176
1 parent 337fe83
commit e8d5176
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/emcc.py b/emcc.py
@@ -1605,7 +1605,7 @@ def get_final():
 
     with ToolchainProfiler.profile_block('memory initializer'):
       memfile = None
-      embed_memfile = (Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
+      embed_memfile = (shared.Settings.SINGLE_FILE or shared.Settings.MEM_INIT_METHOD == 0) and (not shared.Settings.MAIN_MODULE and not shared.Settings.SIDE_MODULE and options.debug_level < 4)
 
       if shared.Settings.MEM_INIT_METHOD > 0 or embed_memfile:
         memfile = target + '.mem'

diff --git a/src/settings.js b/src/settings.js
@@ -881,3 +881,6 @@ var SINGLE_FILE = 0; // If set to 1, embeds all subresources in the emitted file
 var WASM_TEXT_FILE = ''; // name of the file containing wasm text, if relevant
 var WASM_BINARY_FILE = ''; // name of the file containing wasm binary, if relevant
 var ASMJS_CODE_FILE = ''; // name of the file containing asm.js, if relevant
+
+var INCLUDE_THIRD_PARTY_SODIUMUTIL = 0; // If set to 1, sodiumutil will be included in the bundle.
+                                        // Automatically set as needed, specifically for SINGLE_FILE.