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.

Sign up for GitHub

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

Jump to bottom

Fix relocation when cross compiling #3995

Merged
merged 1 commit into from Jul 24, 2020
Merged

Fix relocation when cross compiling #3995

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions conda_build/post.py
View file
Open in desktop
Expand Up @@ -398,10 +398,6 @@ def osx_ch_link(path, link_dict, host_prefix, build_prefix, files):


def mk_relative_osx(path, host_prefix, build_prefix, files, rpaths=('lib',)):
if sys.platform != 'darwin':
log = utils.get_logger(__name__)
log.warn("Found Mach-O file but patching is only supported on macOS, skipping: %s", path)
return
prefix = build_prefix if exists(build_prefix) else host_prefix
names = macho.otool(path, prefix)
s = macho.install_name_change(path, prefix,
Expand Down Expand Up @@ -1259,6 +1255,10 @@ def post_process_shared_lib(m, f, files, host_prefix=None):
mk_relative_linux(f, m.config.host_prefix, rpaths=rpaths,
method=m.get_value('build/rpaths_patcher', None))
elif codefile_t == 'machofile':
if m.config.host_platform != 'osx':
log = utils.get_logger(__name__)
log.warn("Found Mach-O file but patching is only supported on macOS, skipping: %s", path)
return
mk_relative_osx(path, host_prefix, m.config.build_prefix, files=files, rpaths=rpaths)


Expand Down