Skip to content

Apply RPATH logic for OSX - #351

Merged
ndgrigorian merged 1 commit into
masterfrom
fix-rpath-osx
Jul 31, 2026
Merged

Apply RPATH logic for OSX#351
ndgrigorian merged 1 commit into
masterfrom
fix-rpath-osx

Conversation

@ndgrigorian

Copy link
Copy Markdown
Collaborator

This PR fixes an oversight when mkl_fft was updated to use meson-python, namely, that mkl_fft is built for OSX on conda-forge. Logic for the RPATH was removed.

This PR reverts that change, aligning to mkl-service

Copilot AI review requested due to automatic review settings July 31, 2026 15:28
identical logic was used in mkl-service

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR restores RPATH handling in the Meson build to support macOS (as used by conda-forge), aligning runtime library discovery behavior with mkl-service.

Changes:

  • Extend RPATH setup from Linux-only to all non-Windows platforms.
  • Use @loader_path on macOS and $ORIGIN elsewhere to construct relative RPATH entries.

Comment thread meson.build

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

Suppressed comments (1)

meson.build:39

  • On macOS, -rpath does not accept a colon-separated list the way GNU ld does; passing @loader_path/../..:@loader_path/../../.. will be treated as a single (invalid) path. Build rpath_link_args as multiple -Wl,-rpath,<path> entries instead of concatenating with :.
    rpath = origin / '../..' + ':' + origin / '../../..'
    rpath_link_args = ['-Wl,-rpath,' + rpath]

@vlad-perevezentsev vlad-perevezentsev left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM
Thank you @ndgrigorian !

@ndgrigorian
ndgrigorian merged commit 9aec36d into master Jul 31, 2026
85 of 97 checks passed
@ndgrigorian
ndgrigorian deleted the fix-rpath-osx branch July 31, 2026 15:47
ndgrigorian added a commit that referenced this pull request Jul 31, 2026
ndgrigorian added a commit that referenced this pull request Jul 31, 2026
ndgrigorian added a commit that referenced this pull request Jul 31, 2026
ndgrigorian added a commit that referenced this pull request Jul 31, 2026
@antonwolfy antonwolfy added this to the 2.4.0 release milestone Aug 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants