Merge pull request #37 from eed3si9n/wip/universal

Fixes M1 support
sbt · Jan 4, 2023 · 99720b8 · 99720b8
2 parents 645b7c6 + ea76485
commit 99720b8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main/java/org/scalasbt/ipcsocket/NativeLoader.java b/src/main/java/org/scalasbt/ipcsocket/NativeLoader.java
@@ -57,6 +57,12 @@ static void load() throws UnsatisfiedLinkError {
       if (arch.equals("amd64")) {
         arch = "x86_64";
       }
+      // https://github.com/sbt/sbt/issues/7117
+      // Currently only Linux has ARM-specific binary. The macOS binary is a universal binary,
+      // and Windows can potentially emulate x86.
+      if (isMac || isWindows) {
+        arch = "x86_64";
+      }
       if (is64bit && (isMac || isLinux || isWindows)) {
         final String extension = "." + (isMac ? "dylib" : isWindows ? "dll" : "so");
         final String libName = (isWindows ? "" : "lib") + "sbtipcsocket" + extension;