Remove dependency on sulong-managed

eregon · eregon · commit caca197e71b9 · 2025-05-29T13:38:24.000+02:00
diff --git a/mx.truffleruby/jvm-ee b/mx.truffleruby/jvm-ee
@@ -1,2 +1,2 @@
-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise
 BUILD_TARGETS=TRUFFLERUBY_JVM_STANDALONE
diff --git a/mx.truffleruby/jvm-ee-libgraal b/mx.truffleruby/jvm-ee-libgraal
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed,/substratevm-enterprise
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/substratevm-enterprise
 BUILD_TARGETS=TRUFFLERUBY_JVM_STANDALONE
 COMPONENTS=LibGraal Enterprise
 NATIVE_IMAGES=lib:jvmcicompiler
diff --git a/mx.truffleruby/mx_truffleruby.py b/mx.truffleruby/mx_truffleruby.py
@@ -192,10 +192,7 @@ def __init__(self, suite, name, deps, workingSets, output=None, **kwArgs):
 
 def truffleruby_standalone_deps():
     include_truffle_runtime = not mx.env_var_to_bool("EXCLUDE_TRUFFLE_RUNTIME")
-    deps = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=include_truffle_runtime)
-    if mx_sdk_vm_ng.uses_enterprise_sources():
-        deps += ['sulong-managed:SULONG_ENTERPRISE_NATIVE']
-    return deps
+    return mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=include_truffle_runtime)
 
 def librubyvm_build_args():
     if mx_sdk_vm_ng.is_nativeimage_ee() and mx.get_os() == 'linux' and 'NATIVE_IMAGE_AUXILIARY_ENGINE_CACHE' not in os.environ:
diff --git a/mx.truffleruby/native-ee b/mx.truffleruby/native-ee
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed,/substratevm-enterprise,substratevm-enterprise-gcs
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
 BUILD_TARGETS=TRUFFLERUBY_NATIVE_STANDALONE
 COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise,suite:substratevm-enterprise-gcs
 NATIVE_IMAGES=lib:rubyvm
diff --git a/mx.truffleruby/native-ee-aux b/mx.truffleruby/native-ee-aux
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed,/substratevm-enterprise
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/substratevm-enterprise
 BUILD_TARGETS=TRUFFLERUBY_NATIVE_STANDALONE
 COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise
 NATIVE_IMAGES=lib:rubyvm
diff --git a/mx.truffleruby/native-ee-host-inlining b/mx.truffleruby/native-ee-host-inlining
@@ -1,4 +1,4 @@
-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed,/substratevm-enterprise,substratevm-enterprise-gcs
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
 BUILD_TARGETS=TRUFFLERUBY_NATIVE_STANDALONE
 COMPONENTS=SubstrateVM Enterprise,Truffle SVM Macro Enterprise,suite:substratevm-enterprise-gcs
 NATIVE_IMAGES=lib:rubyvm

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed`
	`1`	`+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise`
`2`	`2`	`BUILD_TARGETS=TRUFFLERUBY_JVM_STANDALONE`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/sulong-managed,/substratevm-enterprise`
	`1`	`+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/substratevm-enterprise`
`2`	`2`	`BUILD_TARGETS=TRUFFLERUBY_JVM_STANDALONE`
`3`	`3`	`COMPONENTS=LibGraal Enterprise`
`4`	`4`	`NATIVE_IMAGES=lib:jvmcicompiler`