Skip to content

Commit 82eca60

Browse files
interpretorrgbkrk
authored andcommitted
Add armv8 prebuilds (#163)
1 parent f9503b4 commit 82eca60

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@ matrix:
1010
- os: linux
1111
dist: trusty
1212
node_js: "6"
13-
env: ELECTRON="1.4.10"
13+
env:
14+
- DEPLOY="true"
15+
- ARCH="armv7"
1416
- os: linux
1517
dist: trusty
1618
node_js: "6"
1719
env:
1820
- DEPLOY="true"
19-
- ARCH="armv7"
21+
- ARCH="armv8"
22+
- os: linux
23+
dist: trusty
24+
node_js: "6"
25+
env: ELECTRON="1.4.10"
2026
- os: osx
2127
node_js: "6"
2228
env: DEPLOY="true"

scripts/cross_compile.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
ARCH=$1
44
GH_TOKEN=$2
55

6-
# Only support armv7 for now
76
if [[ "${ARCH}" == "armv7" ]]; then
87
TRIPLE="arm-linux-gnueabihf"
98
GCC="4.8"
10-
PACKAGES="gcc-${GCC}-${TRIPLE} g++-${GCC}-${TRIPLE}"
11-
export CC="${TRIPLE}-gcc-${GCC}"
12-
export CXX="${TRIPLE}-g++-${GCC}"
13-
export STRIP="${TRIPLE}-strip"
9+
elif [[ "${ARCH}" == "armv8" ]]; then
10+
TRIPLE="aarch64-linux-gnu"
11+
GCC="4.8"
1412
else
1513
exit 1
1614
fi
1715

18-
# Update dependencies
19-
sudo apt-get -qq update
20-
sudo apt-get install -y ${PACKAGES}
21-
16+
PACKAGES="gcc-${GCC}-${TRIPLE} g++-${GCC}-${TRIPLE}"
17+
export CC="${TRIPLE}-gcc-${GCC}"
18+
export CXX="${TRIPLE}-g++-${GCC}"
19+
export STRIP="${TRIPLE}-strip"
2220
export ZMQ_BUILD_OPTIONS="--host=${TRIPLE}"
2321

2422
echo "Building zeromq.js for ${ARCH}"
2523

26-
if [[ -z $2 ]]; then
24+
if [[ -z $GH_TOKEN ]]; then
25+
sudo apt-get -qq update
26+
sudo apt-get install -y ${PACKAGES}
2727
npm install "--arch=${TRIPLE}"
2828
else
2929
./node_modules/prebuild/bin.js "--arch=${ARCH}" --all --strip -u "${GH_TOKEN}"

scripts/prebuild-install.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ var pbi = 'prebuild-install';
44
var platform = process.platform;
55
var arch = process.arch;
66

7-
if (platform === 'linux' && arch === 'arm') {
8-
arch += 'v' + process.config.variables.arm_version;
9-
pbi += ' --arch=' + arch;
7+
if (
8+
platform === 'linux' &&
9+
(arch === 'arm' || arch === 'arm64')
10+
) {
11+
var armv = (arch === 'arm64') ? '8' : process.config.variables.arm_version;
12+
pbi += ' --arch=armv' + armv;
1013
}
1114

1215
exec(pbi, function(err, stdout, stderr) {

0 commit comments

Comments
 (0)