Added support for aarch64 architecture (#745).

pkulchenko · Mar 8, 2017 · cc01fc4 · cc01fc4
1 parent b5760a0
commit cc01fc4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/build/build-linux.sh b/build/build-linux.sh
@@ -15,6 +15,10 @@ case "$(uname -m)" in
 		FPIC="-fpic"
 		ARCH="armhf"
 		;;
+        aarch64)
+		FPIC="-fpic"
+		ARCH="aarch64"
+		;;
 	*)
 		FPIC=""
 		ARCH="x86"

diff --git a/src/main.lua b/src/main.lua
@@ -18,8 +18,12 @@ if islinux then
   local file = io.popen("uname -m")
   if file then
     local machine=file:read("*l")
-    local archtype= { x86_64="x64", armv7l="armhf" }
-    arch = archtype[machine] or "x86"
+    local archtype= {
+      x86_64  = "x64",
+      armv7l  = "armhf",
+      aarch64 = "aarch64",
+    }
+    arch = archtype[machine] or arch
     file:close()
   end
 end

diff --git a/zbstudio.sh b/zbstudio.sh
@@ -11,9 +11,10 @@ if [[ $(uname) == "Darwin" ]]; then
    open zbstudio/ZeroBraneStudio.app --args "$@")
 else
   case "$(uname -m)" in
-	x86_64) ARCH=x64;;
-	armv7l) ARCH=armhf;;
-	*)	ARCH=x86;;
+    x86_64)  ARCH=x64;;
+    armv7l)  ARCH=armhf;;
+    aarch64) ARCH=aarch64;;
+    *)       ARCH=x86;;
   esac
   (cd "$DIR"; bin/linux/$ARCH/lua src/main.lua zbstudio "$@") &
 fi