Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2019-07-22 17:34:33 +0300
committerRich Trott <rtrott@gmail.com>2019-07-24 21:32:44 +0300
commit30666edd05dd7603e4e97184370cdc6cad7ce71d (patch)
treeba44fcb7790f481bc08a29f6b6db174e55086c28 /Makefile
parentc5befe30931c3a6b62f002f11c869200f05ba3aa (diff)
build: `uname -m` is amd64 on freebsd, not x86_64
Fixes: https://github.com/nodejs/node/issues/13150 PR-URL: https://github.com/nodejs/node/pull/28804 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d7427e578f8..6991572f553 100644
--- a/Makefile
+++ b/Makefile
@@ -806,6 +806,9 @@ UNAME_M=$(shell uname -m)
ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
DESTCPU ?= x64
else
+ifeq ($(findstring amd64,$(UNAME_M)),amd64)
+DESTCPU ?= x64
+else
ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
DESTCPU ?= ppc64
else
@@ -865,6 +868,7 @@ endif
endif
endif
endif
+endif
# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
# pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.