Skip to content

Commit a9aca93

Browse files
committed
Always copy libpythonvm.so.debug for graalpy-standalone for native standalones
* Clarify what dev means. * Remove unnecessary checks.
1 parent ee36da4 commit a9aca93

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,9 @@ def _graalpy_launcher():
610610
return f"{name}.exe" if WIN32 else name
611611

612612

613-
# dev means Default TruffleRuntime and "build the minimum possible"
613+
# dev only has effect if standalone_type is 'jvm' and means minimal, Default TruffleRuntime (no JIT)
614614
def graalpy_standalone_home(standalone_type, enterprise=False, dev=False, build=True):
615615
assert standalone_type in ['native', 'jvm']
616-
assert not (enterprise and dev), "EE dev standalones are not implemented yet"
617616
jdk_version = mx.get_jdk().version
618617

619618
# Check if GRAALPY_HOME points to some compatible pre-built GraalPy standalone
@@ -677,7 +676,7 @@ def graalpy_standalone_home(standalone_type, enterprise=False, dev=False, build=
677676

678677
python_home = os.path.join(SUITE.dir, 'mxbuild', f"{mx.get_os()}-{mx.get_arch()}", standalone_dist)
679678

680-
if dev and standalone_type == 'native':
679+
if standalone_type == 'native':
681680
debuginfo = os.path.join(SUITE.dir, 'mxbuild', f"{mx.get_os()}-{mx.get_arch()}", "libpythonvm", "libpythonvm.so.debug")
682681
if os.path.exists(debuginfo):
683682
shutil.copy(debuginfo, os.path.join(python_home, 'lib'))
@@ -872,7 +871,7 @@ def python_svm(_=None):
872871
Also builds the standalone if not built already."""
873872
if mx_gate.get_jacoco_agent_args():
874873
return python_jvm()
875-
launcher = graalpy_standalone('native', dev=True)
874+
launcher = graalpy_standalone('native')
876875
mx.log(launcher)
877876
return launcher
878877

@@ -2501,9 +2500,6 @@ def graalpy_standalone_wrapper(args_in):
25012500
parser.add_argument('--no-build', action='store_true',
25022501
help="Doesn't build the standalone, only prints the patch to its launcher")
25032502
args = parser.parse_args(args_in)
2504-
if args.edition == 'ee':
2505-
if not mx.suite('graalpython-enterprise', fatalIfMissing=False):
2506-
mx.abort("You must add --dynamicimports graalpython-enterprise for EE edition")
25072503
print(graalpy_standalone(args.type, enterprise=args.edition == 'ee', build=not args.no_build))
25082504

25092505
def graalpy_jmh(args):

0 commit comments

Comments
 (0)