Merge pull request #56 from JL2210/fix-arm64-build

arm64 build cleanup

.travis.yml

@@ -5,9 +5,9 @@ matrix:
     - os: linux
       sudo: required
       env: BUILDARCH=ia32
-#    - os: linux
-#      sudo: required
-#      env: BUILDARCH=arm64
+    - os: linux
+      sudo: required
+      env: BUILDARCH=arm64
     - os: osx
 
 language: node_js

build.sh

@@ -5,6 +5,12 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
 
   if [[ "$BUILDARCH" == "ia32" ]]; then
     export npm_config_arch=ia32
+    export npm_config_target_arch=ia32
+  fi
+
+  if [[ "$BUILDARCH" == "arm64" ]]; then
+    export npm_config_arch=arm64
+    export npm_config_target_arch=arm64
   fi
   ../update_settings.sh
 

install_deps.sh

@@ -22,10 +22,15 @@ else
     export CXXFLAGS=-m32
     export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
   elif [[ $BUILDARCH == "arm64" ]]; then
-    # Use the default C / C++ compilers,
-    # because some makefiles default to CC:=gcc:
-    export CC=/usr/bin/cc
-    export CXX=/usr/bin/c++
+    echo "deb http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/arm64.list >/dev/null
+    sudo dpkg --add-architecture arm64
+    sudo apt-get update
+    sudo apt-get install libc6-dev-arm64-cross gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+    sudo apt-get install libx11-dev:arm64 libxkbfile-dev:arm64
+    export CC=/usr/bin/aarch64-linux-gnu-gcc
+    export CXX=/usr/bin/aarch64-linux-gnu-g++
+    export CC_host=/usr/bin/gcc
+    export CXX_host=/usr/bin/g++
   else
     sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
   fi