diff --git a/.travis.yml b/.travis.yml index 445d374..89e489d 100644 --- a/.travis.yml +++ b/.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 diff --git a/build.sh b/build.sh index ddef3d2..09c2d5a 100755 --- a/build.sh +++ b/build.sh @@ -8,6 +8,10 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then export npm_config_arch=ia32 fi + if [[ "$BUILDARCH" == "arm64" ]]; then + export npm_config_arch=arm64 + fi + ../update_settings.sh yarn diff --git a/install_deps.sh b/install_deps.sh index 63839cb..c3ce7ce 100755 --- a/install_deps.sh +++ b/install_deps.sh @@ -12,10 +12,18 @@ else sudo apt-get update sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib 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 - # 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