Skip to content

[v634] Fix macOS15.4 builds#18243

Merged
dpiparo merged 5 commits into
root-project:v6-34-00-patchesfrom
devajithvs:v6-34-00-patches
Apr 5, 2025
Merged

[v634] Fix macOS15.4 builds#18243
dpiparo merged 5 commits into
root-project:v6-34-00-patchesfrom
devajithvs:v6-34-00-patches

Conversation

@devajithvs
Copy link
Copy Markdown
Contributor

@devajithvs devajithvs commented Apr 3, 2025

@devajithvs devajithvs requested review from hahnjo and vgvassilev April 3, 2025 12:03
@devajithvs devajithvs self-assigned this Apr 3, 2025
@devajithvs devajithvs added the clean build Ask CI to do non-incremental build on PR label Apr 3, 2025
@devajithvs devajithvs closed this Apr 3, 2025
@devajithvs devajithvs reopened this Apr 3, 2025
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 3, 2025

Test Results

    18 files      18 suites   4d 5h 40m 36s ⏱️
 2 685 tests  2 684 ✅ 0 💤 1 ❌
46 567 runs  46 566 ✅ 0 💤 1 ❌

For more details on these failures, see this check.

Results for commit f64a844.

♻️ This comment has been updated with latest results.

@devajithvs devajithvs requested a review from couet as a code owner April 3, 2025 13:48
@devajithvs devajithvs changed the title [v634] [runtime-cxxmodules] Adapt the darwin modulemaps to sdk 15.4. (#18231) [v634] fixing macOS15.4 builds Apr 3, 2025
@devajithvs devajithvs changed the title [v634] fixing macOS15.4 builds [v634] Fix macOS15.4 builds Apr 3, 2025
@devajithvs devajithvs force-pushed the v6-34-00-patches branch 2 times, most recently from 64c1c65 to f64d463 Compare April 4, 2025 09:26
@devajithvs devajithvs requested a review from pcanal as a code owner April 4, 2025 09:26
Copy link
Copy Markdown
Member

@pcanal pcanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@devajithvs devajithvs marked this pull request as draft April 4, 2025 19:00
ktf and others added 5 commits April 4, 2025 22:10
`less` is defined in functional according to the C++ standard.

(cherry picked from commit 82858ce)
…roject#18231)

* [runtime-cxxmodules] Adapt the darwin modulemaps to sdk 15.4.

* [runtime-cxmodules] Use separate modulemap for macOS15.2

* [runtime-cxxmodules] Add overlay entry for MacOSX15.2

---------

Co-authored-by: Devajith Valaparambil Sreeramaswamy <devajith.valaparambil.sreeramaswamy@cern.ch>
(cherry picked from commit ff43ae8)
Clang may emit calls to compiler-rt symbols such as __divdc3 for
std::complex<T> division. These may not be resolved during JIT'ing
on macOS when using Cling.

This patch forward-declares the relevant symbols and explicitly
injects them into the JIT symbol table.

Similar to: root-project@4b6075b

(cherry picked from commit 038ee1f)
Thanks to @ktf (ALICE) for this fix.

(cherry picked from commit 21a9e6c)
to address the new behaviour of the compiler shipped with XCode 16.3
@devajithvs devajithvs force-pushed the v6-34-00-patches branch 2 times, most recently from 2f6b26f to f64a844 Compare April 4, 2025 23:23
@devajithvs devajithvs marked this pull request as ready for review April 5, 2025 06:32
@devajithvs
Copy link
Copy Markdown
Contributor Author

devajithvs commented Apr 5, 2025

Marking it ready for review. I can't figure out why the CI fails for mac beta. I am not able to reproduce the CI error by logging into the same machine and building with the same configuration.

Does anyone have an idea why this might be happening?

@dpiparo dpiparo merged commit 44c5092 into root-project:v6-34-00-patches Apr 5, 2025
@bpnuke bpnuke mentioned this pull request Apr 8, 2025
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

clean build Ask CI to do non-incremental build on PR pr:backport

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants