[GR-65750] Remove unnecessary dependency on sulong-managed

Author: eregon

espresso/mx.espresso/jvm-ee-llvm

@@ -1,5 +1,5 @@
-# /vm-enterprise,/substratevm-enterprise,/truffle-enterprise,/sulong-managed,/tools-enterprise,/regex with EE components, with libgraal, doesn't build native standalone
-DYNAMIC_IMPORTS=/vm-enterprise,/substratevm-enterprise,/truffle-enterprise,/sulong-managed,/tools-enterprise,/regex
+# /vm-enterprise,/substratevm-enterprise,/truffle-enterprise,/sulong,/tools-enterprise,/regex with EE components, with libgraal, doesn't build native standalone
+DYNAMIC_IMPORTS=/vm-enterprise,/substratevm-enterprise,/truffle-enterprise,/sulong,/tools-enterprise,/regex
 COMPONENTS=cmp,cmpee,gvm,jipher,lg,ni,nic,niee,nil,sdkni,svm,svmjdwp,svmt,svmee,svmte,svmsl,tflc,tflsm
 NATIVE_IMAGES=lib:jvmcicompiler
 NON_REBUILDABLE_IMAGES=lib:jvmcicompiler

espresso/mx.espresso/mx_espresso.py

@@ -140,11 +140,6 @@ def jvm_standalone_deps():
             "sulong:SULONG_NATIVE",
             "sulong:SULONG_NFI",
         ]
-        if mx.suite('sulong-managed', fatalIfMissing=False):
-            result += [
-                'sulong-managed:SULONG_ENTERPRISE',
-                'sulong-managed:SULONG_ENTERPRISE_NATIVE',
-            ]
     if mx.suite('truffle-enterprise', fatalIfMissing=False):
         result.append('truffle-enterprise:TRUFFLE_ENTERPRISE')
     return result

espresso/mx.espresso/suite.py

@@ -915,8 +915,6 @@
             # - sulong:SULONG_CORE
             # - sulong:SULONG_NATIVE
             # - sulong:SULONG_NFI
-            # - sulong-managed:SULONG_ENTERPRISE
-            # - sulong-managed:SULONG_ENTERPRISE_NATIVE
             # - truffle-enterprise:TRUFFLE_ENTERPRISE
             "dynamicDistDependencies": "jvm_standalone_deps",
             "maven": False,

sulong/mx.sulong/mx_sulong.py

@@ -114,13 +114,12 @@ def sulong_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 has_suite('sulong-managed'):
-        # SULONG_ENTERPRISE and SULONG_MANAGED do not belong in the EE standalone of SULONG_NATIVE, but we want a single definition of libllvmvm.
-        # So we compromise here by including them. We do not use or distribute the EE standalone of SULONG_NATIVE so it does not matter.
+        # SULONG_MANAGED does not belong in the EE standalone of SULONG_NATIVE, but we want a single definition of libllvmvm.
+        # So we compromise here by including SULONG_MANAGED if sulong-managed is imported.
+        # We do not use or distribute the EE standalone of SULONG_NATIVE so it does not matter.
         # See also the comments in suite.py, in SULONG_*_STANDALONE_RELEASE_ARCHIVE.
         deps += [
-            'sulong-managed:SULONG_ENTERPRISE',
             'sulong-managed:SULONG_MANAGED',
-            'sulong-managed:SULONG_ENTERPRISE_NATIVE',
         ]
     return deps