Skip to content

Commit eeb4595

Browse files
committed
[GR-53767] Fix building standalone executable when the user provides a GraalVM CE JDK
1 parent 789403b commit eeb4595

File tree

1 file changed

+10
-4
lines changed
  • graalpython/lib-graalpython/modules/standalone

1 file changed

+10
-4
lines changed

graalpython/lib-graalpython/modules/standalone/__main__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ def get_download_dir(parsed_args):
160160

161161
def create_native_exec(parsed_args):
162162
artifacts = ["org.graalvm.python.python-embedding"]
163-
if parsed_args.ce:
164-
artifacts.append("org.graalvm.polyglot.python-community")
165-
else:
166-
artifacts.append("org.graalvm.polyglot.python")
167163

168164
target_dir = tempfile.mkdtemp()
169165
try:
170166
ni, jc = get_tools(target_dir, parsed_args)
167+
if parsed_args.ce:
168+
artifacts.append("org.graalvm.polyglot.python-community")
169+
else:
170+
artifacts.append("org.graalvm.polyglot.python")
171171

172172
modules_path = get_download_dir(parsed_args)
173173
for artifact in artifacts:
@@ -360,6 +360,12 @@ def get_tools(target_dir, parsed_args):
360360
print(f"GraalVM downloaded from {graalvm_url} has no native image or javac")
361361
sys.exit(1)
362362

363+
# When building with a CE native image, we need to use community options
364+
if "GraalVM CE" in subprocess.check_output([ni, "--version"], text=True):
365+
if parsed_args.verbose and not parsed_args.ce:
366+
print("Using GraalVM CE, disabling Oracle GraalVM-specific options")
367+
parsed_args.ce = True
368+
363369
return ni, jc
364370

365371

0 commit comments

Comments
 (0)