JL2210 6 éve
szülő
commit
a4ea6d60a4
3 módosított fájl, 19 hozzáadás és 7 törlés
  1. 3 3
      .travis.yml
  2. 4 0
      build.sh
  3. 12 4
      install_deps.sh

+ 3 - 3
.travis.yml

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

+ 4 - 0
build.sh

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

+ 12 - 4
install_deps.sh

@@ -12,10 +12,18 @@ else
     sudo apt-get update
     sudo apt-get update
     sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib
     sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib
     sudo apt-get install libx11-dev:i386 libxkbfile-dev:i386
     sudo apt-get install libx11-dev:i386 libxkbfile-dev:i386
+    export CC="/usr/bin/gcc -m32"
+    export CXX="/usr/bin/g++ -m32"
+    export CC_host=/usr/bin/gcc
+    export CXX_host=/usr/bin/g++
   elif [[ $BUILDARCH == "arm64" ]]; then
   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++
+    sudo dpkg --add-architecture arm64
+    sudo apt-get update
+    sudo apt-get install libc6-dev:arm64 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++
   fi
   fi
 fi
 fi