summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohan Bergström <bugs@bergstroem.nu>2016-02-11 13:57:20 +1100
committerJohan Bergström <bugs@bergstroem.nu>2016-02-11 21:55:51 +1100
commitf167207d0e4bce0161450f9e32e3e28d2a7a74ec (patch)
treef988a065083a9fcbee64138cca08977363838bfa /Makefile
parent2848f84332dc2292fd08df083640ac09e5e571aa (diff)
downloadandroid-node-v8-f167207d0e4bce0161450f9e32e3e28d2a7a74ec.tar.gz
android-node-v8-f167207d0e4bce0161450f9e32e3e28d2a7a74ec.tar.bz2
android-node-v8-f167207d0e4bce0161450f9e32e3e28d2a7a74ec.zip
build: treat aarch64 as arm64
`Makefile` is now consistent with `configure` regarding how we treat aarch64. PR-URL: https://github.com/nodejs/node/pull/5191 Fixes: https://github.com/nodejs/node/issues/5175 Reviewed-By: Rod Vagg <r@va.gg> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 31e964d080..91af2977cd 100644
--- a/Makefile
+++ b/Makefile
@@ -272,6 +272,9 @@ else
ifeq ($(DESTCPU),arm)
ARCH=arm
else
+ifeq ($(DESTCPU),aarch64)
+ARCH=arm64
+else
ifeq ($(DESTCPU),ppc64)
ARCH=ppc64
else
@@ -283,6 +286,7 @@ endif
endif
endif
endif
+endif
# enforce "x86" over "ia32" as the generally accepted way of referring to 32-bit intel
ifeq ($(ARCH),ia32)