vmtool support mac arm64 #2036

.github/workflows/build-vmtool.yaml

@@ -21,7 +21,7 @@ jobs:
           path: arthas-vmtool/target/lib*
 
   mac:
-    runs-on: macos-10.15
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v2

arthas-vmtool/pom.xml

@@ -20,13 +20,12 @@
             <activation>
                 <os>
                     <family>mac</family>
-                    <arch>x86_64</arch>
                 </os>
             </activation>
             <properties>
                 <os_name>macos</os_name>
-                <os_arch_option>-m64</os_arch_option>
-                <lib_name>libArthasJniLibrary-x64.dylib</lib_name>
+                <os_arch_option>-arch x86_64 -arch arm64</os_arch_option>
+                <lib_name>libArthasJniLibrary.dylib</lib_name>
             </properties>
         </profile>
 
@@ -181,7 +180,7 @@
                         <linkerStartOption>${os_arch_option}</linkerStartOption>
                         <linkerStartOption>-fpic</linkerStartOption>
                         <linkerStartOption>-shared</linkerStartOption>
-                        <linkerStartOption>-o</linkerStartOption>
+                        <!-- <linkerStartOption>-o</linkerStartOption> -->
                     </linkerStartOptions>
                     <linkerEndOptions>
                         <linkerEndOption>-o ${project.build.directory}/${lib_name}</linkerEndOption>

common/src/main/java/com/taobao/arthas/common/VmToolUtils.java

@@ -9,7 +9,7 @@ public class VmToolUtils {
     private static String libName = null;
     static {
         if (OSUtils.isMac()) {
-            libName = "libArthasJniLibrary-x64.dylib";
+            libName = "libArthasJniLibrary.dylib";
         }
         if (OSUtils.isLinux()) {
             libName = "libArthasJniLibrary-x64.so";