improve emscripten detection by including emcc.py search#6304
Merged
waruqi merged 1 commit intoxmake-io:devfrom Apr 10, 2025
Merged
improve emscripten detection by including emcc.py search#6304waruqi merged 1 commit intoxmake-io:devfrom
emscripten detection by including emcc.py search#6304waruqi merged 1 commit intoxmake-io:devfrom
Conversation
waruqi
reviewed
Apr 10, 2025
| if emcc then | ||
| emscripten = path.directory(emcc) | ||
| elseif find_file("emcc.py", sdkdir) then | ||
| emscripten = sdkdir |
Member
There was a problem hiding this comment.
local emcc = find_file("emcc", sdkdir, {suffixes = subdirs})
if not emcc then
emcc = find_file("emcc.py", sdkdir)
end
if emcc then
Member
We can add some default search paths here. if is_host("linux") then
table.insert(paths, "/usr/share/emscripten")
end |
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
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.
The
emscriptenpackage in the APT repository does not includeemsdk.py, leading to detection issues in xmake.This PR improves detection by also searching for
emcc.py, which aids in locating the installedemscripten. However, specifying theemsdkpath may still be necessary. For example:xmake g --emsdk=/usr/share/emscripten/xmake g --emsdk=/usr/lib/emscripten(Note: The
emscripteninstallation path may change in the future, so the paths mentioned here might become outdated.)#6298