Skip to content

Commit c9372eb

Browse files
committed
Remove capnproto-runtime.jar from svm/builder directory and move .capnp file to resources
1 parent f896289 commit c9372eb

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

substratevm/mx.substratevm/mx_substratevm.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,6 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
12251225
builder_jar_distributions=[
12261226
'substratevm:SVM',
12271227
'substratevm:OBJECTFILE',
1228-
'substratevm:CAPNPROTO_RUNTIME',
12291228
'substratevm:POINTSTO',
12301229
'substratevm:NATIVE_IMAGE_BASE',
12311230
] + (['substratevm:SVM_FOREIGN'] if mx_sdk_vm.base_jdk().javaCompliance >= '22' else []),
@@ -2462,7 +2461,7 @@ def capnp_compile(args):
24622461
capnpcjava_home = os.environ.get('CAPNPROTOJAVA_HOME')
24632462
if capnpcjava_home is None or not exists(capnpcjava_home + '/capnpc-java'):
24642463
mx.abort('Clone and build capnproto/capnproto-java from GitHub and point CAPNPROTOJAVA_HOME to its path.')
2465-
srcdir = 'src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/'
2464+
srcdir = 'src/com.oracle.svm.hosted/resources/'
24662465
outdir = 'src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/'
24672466
command = ['capnp', 'compile',
24682467
'--import-path=' + capnpcjava_home + '/compiler/src/main/schema/',

0 commit comments

Comments
 (0)