Use the default xcode version & fix emsripten build - #47
Open
Eclips4 wants to merge 5 commits into
Open
Conversation
freakboy3742
approved these changes
Aug 30, 2026
Eclips4
commented
Aug 30, 2026
Eclips4
commented
Aug 30, 2026
Comment on lines
+231
to
+254
| if !have_sysroot && cargo_target.contains("emscripten") { | ||
| let mut candidates = Vec::new(); | ||
| if let Ok(emsdk) = env::var("EMSDK") { | ||
| candidates.push( | ||
| PathBuf::from(&emsdk) | ||
| .join("upstream") | ||
| .join("emscripten") | ||
| .join("cache") | ||
| .join("sysroot"), | ||
| ); | ||
| } | ||
| if let Ok(cc) = env::var("PY_CC") | ||
| && let Some(parts) = shlex::split(&cc) | ||
| && let Some(binary) = parts.first() | ||
| && let Some(bin_dir) = Path::new(binary).parent() | ||
| { | ||
| candidates.push(bin_dir.join("cache").join("sysroot")); | ||
| } | ||
| if let Some(sysroot) = candidates.into_iter().find(|p| p.is_dir()) { | ||
| builder = builder.clang_arg(format!("--sysroot={}", sysroot.display())); | ||
| have_sysroot = true; | ||
| } | ||
| } | ||
|
|
Member
Author
There was a problem hiding this comment.
This points bidgen at emsdk's sysroot, same as WASI/Android blocks above.
There was a problem hiding this comment.
It might be simpler to assume that $EMSDK/upstream/emscripten/cache/sysroot points to a valid sysroot and skip the second step.
Eclips4
changed the title
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
4 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.
No description provided.