Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): look for emcc instead of emcc.py #12235

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Conversation

ermshiperete
Copy link
Contributor

@ermshiperete ermshiperete commented Aug 20, 2024

emcc.py is not marked as executable in emcripten's git repo so the build failed when trying to locate emscripten. However, it turns out that emcc is marked as executable, so we use that instead on macOS and Linux (on Windows, executable bit is irrelevant).

@keymanapp-test-bot skip

@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Aug 20, 2024

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

@keymanapp-test-bot keymanapp-test-bot bot added this to the A18S9 milestone Aug 20, 2024
@github-actions github-actions bot added common/ common/resources/ Build infrastructure core/ Keyman Core fix labels Aug 20, 2024
@mcdurdin
Copy link
Member

Don't forget kmcmplib's references to emcc.py as well

@ermshiperete
Copy link
Contributor Author

See also #8934 which did the opposite change.

`emcc.py` is not marked as executable in emcripten's git repo so the
build failed when trying to locate emscripten. However, it turns out
that `emcc` is marked as executable, so we use that instead.

On Windows however, we still need to use `emcc.py` because otherwise
Meson won't detect it as valid compiler.
@ermshiperete ermshiperete merged commit a98ee70 into master Aug 20, 2024
28 checks passed
@ermshiperete ermshiperete deleted the fix/core/emcc_detect branch August 20, 2024 20:41
mcdurdin added a commit that referenced this pull request Aug 21, 2024
This is a manual cherry-pick of #12235, for 17.0-stable.

Cherry-pick-of: #12235
@keyman-server
Copy link
Collaborator

Changes in this pull request will be available for download in Keyman version 18.0.94-alpha

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants