Skip to content

Commit

Permalink
Remove libjli darwin workaround
Browse files Browse the repository at this point in the history
JDK-8235687 changed Contents/MacOS/libjli.dylib from a copy of libjli to
a symlink. This created issues for some applications such as Eclipse so
we changed it back to a symlink in GraalVM.

The workaround is now wrong on some JDK versions since libjli moved.
Also, those issues should now be resolved (JDK-8238225) so we can remove
the workaround.
  • Loading branch information
gilles-duboscq committed Jun 29, 2021
1 parent 1b41b6e commit 83d47dd
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions sdk/mx.sdk/mx_sdk_vm_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,6 @@ def _patch_darwin_jdk():
_incl_list.append((base_dir + '/Contents/Info.plist', plist_src))
_excl_list.append(orig_info_plist)
break
libjli_symlink = {
'source_type': 'link',
'path': '../Home/jre/lib/jli/libjli.dylib' if _src_jdk_version == 8 else '../Home/lib/jli/libjli.dylib'
}
_incl_list.append((base_dir + '/Contents/MacOS/libjli.dylib', libjli_symlink))
_excl_list.append(join(_src_jdk_dir, 'Contents', 'MacOS', 'libjli.dylib'))
return _incl_list, _excl_list

svm_component = get_component('svm', stage1=True)
Expand Down

0 comments on commit 83d47dd

Please sign in to comment.