[GR-69678] Enterprise polyglot uses polyglot isolate resource for wrong platform.

PullRequest: graal/22138

Author: tzezula

truffle/mx.truffle/mx_truffle.py

@@ -1521,8 +1521,8 @@ def build(self):
         subst_eng.register_no_arg('languageId', prj.language_id)
         subst_eng.register_no_arg('languageIds', ', '.join([f'"{l}"' for l in prj.all_language_ids]))
         subst_eng.register_no_arg('resourceId', prj.resource_id)
-        subst_eng.register_no_arg('os', prj.os_name)
-        subst_eng.register_no_arg('arch', prj.cpu_architecture)
+        subst_eng.register_no_arg('OS', prj.os_name.upper())
+        subst_eng.register_no_arg('CPUArchitecture', prj.cpu_architecture.upper())
         file_content = subst_eng.substitute(file_content)
         target_file = _PolyglotIsolateResourceBuildTask._target_file(prj.source_gen_dir(), pkg_name)
         mx_util.ensure_dir_exists(dirname(target_file))

truffle/mx.truffle/polyglot_isolate_resource.template

@@ -42,14 +42,16 @@ package <package>;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.InternalResource;
+import com.oracle.truffle.api.InternalResource.CPUArchitecture;
+import com.oracle.truffle.api.InternalResource.OS;
 
 import com.oracle.truffle.polyglot.enterprise.isolate.PolyglotIsolateLanguages;
 
 import java.io.IOException;
 import java.nio.file.Path;
 
 @InternalResource.Id(value = PolyglotIsolateResource.ID, componentId = "engine", optional = true)
-@PolyglotIsolateLanguages({<languageIds>})
+@PolyglotIsolateLanguages(value={<languageIds>}, os=OS.<OS>, cpuArchitecture=CPUArchitecture.<CPUArchitecture>)
 public final class PolyglotIsolateResource implements InternalResource {
 
     static final String ID = "<resourceId>";