Skip to content

Commit 226ded6

Browse files
committed
[GR-64085] Do not append Contents/Home if the Java Home already points to a GraalVM Home.
PullRequest: graal/20504
2 parents c627a28 + b2703a7 commit 226ded6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sdk/mx.sdk/mx_sdk_vm_ng.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def _find_native_image_command(java_home):
7979
_external_bootstrap_graalvm = java_home
8080
if _external_bootstrap_graalvm:
8181
if mx.is_darwin():
82-
if not _external_bootstrap_graalvm.endswith('/Contents/Home'):
82+
if not exists(join(_external_bootstrap_graalvm, 'release')) and exists(join(_external_bootstrap_graalvm, 'Contents', 'Home')):
8383
_external_bootstrap_graalvm = join(_external_bootstrap_graalvm, 'Contents', 'Home')
8484
_external_bootstrap_graalvm_jdk = mx.JDKConfig(_external_bootstrap_graalvm)
8585
release_dict = mx_sdk_vm.parse_release_file(join(_external_bootstrap_graalvm, 'release'))

0 commit comments

Comments
 (0)