Skip to content

Commit 60699df

Browse files
committed
Fix: ABI tag parsing pattern for hybrid mode
1 parent 89e303f commit 60699df

File tree

1 file changed

+2
-2
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy

1 file changed

+2
-2
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public final class GraalHPyContext extends CExtContext {
133133
public static final long SIZEOF_LONG = java.lang.Long.BYTES;
134134
private static final long NATIVE_ARGUMENT_STACK_SIZE = 1 << 15; // 32 kB stack size
135135

136-
// "blah.hpy123[-310].so"
137-
private static final Pattern SO_NAME_PATTERN = Pattern.compile(".*" + Pattern.quote(HPY_EXT) + "(\\d+)(?:-\\d+)?\\.so$");
136+
// "blah.hpy123[-graalpy231-310].so"
137+
private static final Pattern SO_NAME_PATTERN = Pattern.compile(".*" + Pattern.quote(HPY_EXT) + "(\\d+)(?:-[\\w-]+)?\\.so$");
138138

139139
@TruffleBoundary
140140
public static GraalHPyContext ensureHPyWasLoaded(Node node, PythonContext context, TruffleString name, TruffleString path) throws IOException, ApiInitException, ImportException {

0 commit comments

Comments
 (0)