Add check for keep_llvm_debug + minor touchups.

2 files changed, 3 insertions, 5 deletions

diff --git a/emcc b/emcc
index 9c3514f3..7eb9effa 100755
--- a/emcc
+++ b/emcc
@@ -1595,7 +1595,7 @@ try:
     shell = open(shell_path).read()
     html = open(target, 'w')
     if not Compression.on:
-      if keep_js_debug: generate_source_maps(final, target)
+      if keep_llvm_debug and keep_js_debug: generate_source_maps(final, target)
       html.write(shell.replace('{{{ SCRIPT_CODE }}}', open(final).read()))
     else:
       # Compress the main code
@@ -1666,7 +1666,7 @@ try:
         from tools.split import split_javascript_file
         split_javascript_file(final, unsuffixed(target), split_js_file)
     else:
-        if keep_js_debug: generate_source_maps(final, target)
+        if keep_llvm_debug and keep_js_debug: generate_source_maps(final, target)
 
         # copy final JS to output
         shutil.move(final, target)
diff --git a/tools/sourcemapper.js b/tools/sourcemapper.js
index 1f28b371..3d8dbe99 100755
--- a/tools/sourcemapper.js
+++ b/tools/sourcemapper.js
@@ -5,8 +5,7 @@
 function countLines(s) {
   var count = 0;
   for (var i = 0, l = s.length; i < l; i ++) {
-    var c = s[i];
-    if (c === '\n') count++;
+    if (s[i] === '\n') count++;
   }
   return count;
 }
@@ -74,7 +73,6 @@ function generateMap(fileName, sourceRoot, mapFileBaseName) {
   var seenFiles = Object.create(null);
 
   extractComments(generatedSource, function(content, generatedLineNumber) {
-      console.log(content, generatedLineNumber)
     var matches = /@line (\d+) "([^"]*)"/.exec(content);
     if (matches === null) return;
     var originalLineNumber = parseInt(matches[1], 10);