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 build with MacOSX15.0.sdk and disable clad on mac-beta [v6.32] #15911

Merged
merged 3 commits into from
Jun 24, 2024

Conversation

hahnjo
Copy link
Member

@hahnjo hahnjo commented Jun 24, 2024

Backports of #15900 and #15910

hahnjo and others added 3 commits June 24, 2024 10:39
Manually curating the modulemap is far from ideal because it requires
updates for changes in the libc++ library shipped with the SDK, which
must also work across all supported SDK versions. An alternative would
be to locate the modulemap shipped with libc++ during configuration
time, copy it and dynamically modify its contents to suit our needs.

(cherry picked from commit ece4c81)
When an include from a textual header is resolved, the textual header's
submodule is used as the requesting module. The submodule's uses are
resolved, but that doesn't work because only top level modules have
uses, and only the top level module uses are used for checking uses in
Module::directlyUses. ModuleMap::resolveUses to resolve the top level
module instead of the submodule.

---

This fixes the build of std.pcm with MacOSX15.0.sdk.

(cherry picked from commit bb9629d)
Clad currently has problems with some new headers in MacOSX15.0.sdk
and crashes / errors due to __builtin_pow. Disable it for now while
a solution is worked on, so we can upgrade the nodes and keep the
build green.

(cherry picked from commit c3264ca)
Copy link

Test Results

    11 files      11 suites   2d 11h 44m 56s ⏱️
 2 634 tests  2 634 ✅ 0 💤 0 ❌
27 198 runs  27 198 ✅ 0 💤 0 ❌

Results for commit 337eb4c.

@hahnjo hahnjo merged commit 2e5a812 into root-project:v6-32-00-patches Jun 24, 2024
15 checks passed
@hahnjo hahnjo deleted the macos15-v632 branch June 24, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants