Fix wrong system include when targeting Emscripten. #2205
Closed
Conversation
This file contains 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
samsinsane
requested changes
Apr 29, 2024
| @@ -505,14 +505,16 @@ | |||
| architecture = { | |||
| x86 = function (cfg) | |||
| local r = {} | |||
| if not table.contains(os.getSystemTags(cfg.system), "darwin") then | |||
| if not (table.contains(os.getSystemTags(cfg.system), "darwin") | |||
| or table.contains(os.getSystemTags(cfg.system), "emscripten")) then | |||
There was a problem hiding this comment.
Core doesn't support Emscripten as a target, and shouldn't contain fixes for it. There are two things the Emscripten module should fix:
- It should add appropriate architectures (
asmjsand/orwasm32, maybewasm64too) instead of hijacking existing architectures. This is likely a lot of work with a lot of testing required, so doing the following would suffice. - It should override the outputs from the
clangtoolset, the architecture library directories override should be done here.
There was a problem hiding this comment.
Implemented both your suggestions in tritao/premake-emscripten@e693f23 and tritao/premake-emscripten@ab96fbd.
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.
Fixes an extra system include when targetting Emscripten with the Emscripten Premake extension module.