Fix for parsing existing config in --embedded mode after #495#498
Merged
Conversation
Ooops, I guess even the most innocent-seeming change can have unintended consequences. Switching to embedded by default will at least make this path more tested in the future. Fixed #497
kripken
approved these changes
May 8, 2020
| dot_emscripten_key = dot_emscripten[key].replace("' + emsdk_path + '", emsdk_path()) | ||
| # If running in embedded mode, all paths are stored dynamically relative | ||
| # to the emsdk root, so normalize those first. | ||
| dot_emscripten_key = dot_emscripten[key].replace("emsdk_path + '", "'" + emsdk_path()) |
Member
There was a problem hiding this comment.
this still looks weird to me even with the explanation from before... it's shifting a ' from the right to the left. That seems really surprising.
Can't this just replace ' emsdk_path ' (note the space before and after) with the path?
Collaborator
Author
There was a problem hiding this comment.
No, we also want to replace the += part.
Old:
FOO = emsdk_path + "/some/path"
New:
FOO = "/the/actual/path/some/path"
I can probably come up with a cleaner way to do this overall, but for now this fixes the immediate breakage and I don't think its any nicer before of after this change, right?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ooops, I guess even the most innocent-seeming change can have
unintended consequences. Switching to embedded by default will at
least make this path more tested in the future.
Fixed #497