diff options
| author | Jez Ng <me@jezng.com> | 2013-06-22 22:14:31 -0700 |
|---|---|---|
| committer | Jez Ng <me@jezng.com> | 2013-06-22 23:46:31 -0700 |
| commit | 7ff0dde7802ca3596457d3b15ece6949ed380a15 (patch) | |
| tree | e783289f86dca3b2c8970108773175ee97a67173 /src/modules.js | |
| parent | 2b54c4f9164df8e7aced49930926589f7524de42 (diff) | |
| parent | c001e260ef766875fba65ae1f9848cfe6add90c7 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into source-maps
Conflicts:
emcc
tools/js-optimizer.js
tools/js_optimizer.py
Diffstat (limited to 'src/modules.js')
| -rw-r--r-- | src/modules.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules.js b/src/modules.js index b13ab3c5..d26acbd5 100644 --- a/src/modules.js +++ b/src/modules.js @@ -114,7 +114,8 @@ var Debugging = { m = metadataToParentMetadata[m]; assert(m, 'Confused as to parent metadata for llvm #' + l + ', metadata !' + m); } - this.llvmLineToSourceFile[l] = metadataToFilename[m]; + // Normalize Windows path slashes coming from LLVM metadata, so that forward slashes can be assumed as path delimiters. + this.llvmLineToSourceFile[l] = metadataToFilename[m].replace(/\\5C/g, '/'); } this.on = true; |