Skip to content

Commit

Permalink
Rename armv8 as arm64v8 to match Node's process.arch
Browse files Browse the repository at this point in the history
  • Loading branch information
lovell committed Jan 28, 2019
1 parent 7233283 commit 2fc179b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ the same shared libraries within multiple containers.
* [x64 musl](linuxmusl-x64/Dockerfile)
* [ARMv6](linux-armv6/Dockerfile)
* [ARMv7-A](linux-armv7/Dockerfile)
* [ARMv8-A](linux-armv8/Dockerfile)
* [ARM64v8-A](linux-arm64v8/Dockerfile)

### Windows

Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ $# -lt 1 ]; then
echo "- linuxmusl-x64"
echo "- linux-armv6"
echo "- linux-armv7"
echo "- linux-armv8"
echo "- linux-arm64v8"
echo
exit 1
fi
Expand All @@ -41,8 +41,8 @@ if [ $PLATFORM = "all" ] || [ $PLATFORM = "win32-x64" ]; then
docker run --rm -e "VERSION_VIPS=${VERSION_VIPS}" -v $PWD:/packaging vips-dev-win32-x64 sh -c "/packaging/build/win.sh"
fi

# Linux (x64, ARMv6, ARMv7, ARMv8)
for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-armv7 linux-armv8; do
# Linux (x64, ARMv6, ARMv7, ARM64v8)
for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-armv7 linux-arm64v8; do
if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then
echo "Building $flavour..."
docker build -t vips-dev-$flavour $flavour
Expand Down
4 changes: 2 additions & 2 deletions linux-armv8/Dockerfile → linux-arm64v8/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:stretch
MAINTAINER Lovell Fuller <[email protected]>

# Create Debian-based container suitable for cross-compiling Linux ARMv8-A binaries
# Create Debian-based container suitable for cross-compiling Linux ARM64v8-A binaries

# Build dependencies
RUN \
Expand All @@ -16,7 +16,7 @@ RUN \
# Compiler settings
ENV \
PATH="/root/.cargo/bin:$PATH" \
PLATFORM="linux-armv8" \
PLATFORM="linux-arm64v8" \
CHOST="aarch64-linux-gnu" \
FLAGS="-march=armv8-a -Os -D_GLIBCXX_USE_CXX11_ABI=0"

Expand Down
File renamed without changes.

0 comments on commit 2fc179b

Please sign in to comment.