[GR-22782] Sulong launchers code modified to facilitate single-image launchers.

PullRequest: graal/17916

Author: zslajchrt

sulong/mx.sulong/mx_sulong.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -410,7 +410,7 @@ class ToolchainConfig(object):
         "BINUTIL": ["graalvm-{name}-binutil"] + _llvm_tool_map + ["llvm-" + i for i in _llvm_tool_map]
     }
 
-    def __init__(self, name, dist, bootstrap_dist, tools, suite, select_flags=None):
+    def __init__(self, name, dist, bootstrap_dist, tools, suite, tool_map_templ=None, select_flags=None):
         self.name = name
         self.dist = dist if isinstance(dist, list) else [dist]
         self.bootstrap_provider = create_toolchain_root_provider(name, bootstrap_dist)
@@ -420,7 +420,9 @@ def __init__(self, name, dist, bootstrap_dist, tools, suite, select_flags=None):
         self.suite = suite
         self.select_flags = select_flags or []
         self.mx_command = self.name + '-toolchain'
-        self.tool_map = {tool: [_exe_sub(alias.format(name=name)) for alias in aliases] for tool, aliases in ToolchainConfig._tool_map.items()}
+        if tool_map_templ is None:
+            tool_map_templ = ToolchainConfig._tool_map
+        self.tool_map = {tool: [_exe_sub(alias.format(name=name)) for alias in aliases] for tool, aliases in tool_map_templ.items()}
         self.path_map = {_exe_sub(path): tool for tool, aliases in self.tool_map.items() for path in aliases}
         # register mx command
         mx.update_commands(_suite, {

sulong/projects/com.oracle.truffle.llvm.toolchain.launchers/src/com/oracle/truffle/llvm/toolchain/launchers/AbstractBinUtil.java

@@ -54,7 +54,10 @@ public final void run(String[] args) {
         }
 
         final Path toolPath = getTargetPath(toolName);
+        runTool(toolPath, args);
+    }
 
+    public static void runTool(Path toolPath, String[] args) {
         ArrayList<String> utilArgs = new ArrayList<>(args.length + 1);
         utilArgs.add(toolPath.toString());
         if (args.length > 0) {
@@ -83,7 +86,7 @@ private static boolean isWindows() {
         return System.getProperty("os.name").startsWith("Windows");
     }
 
-    private static String getProcessName() {
+    public static String getProcessName() {
         String binPathName = System.getProperty("org.graalvm.launcher.executablename");
 
         if (binPathName == null) {