1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: uname -m is amd64 on freebsd, not x86_64

Browse Source 
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>
This commit is contained in:
Ben Noordhuis 2019-07-22 16:34:33 +02:00 committed by Rich Trott
parent c5befe3093
commit 30666edd05
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -806,6 +806,9 @@ UNAME_M=$(shell uname -m)
ifeq ($(findstring x86_64,$(UNAME_M)),x86_64) ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
DESTCPU ?= x64 DESTCPU ?= x64
else else
ifeq ($(findstring amd64,$(UNAME_M)),amd64)
DESTCPU ?= x64
else
ifeq ($(findstring ppc64,$(UNAME_M)),ppc64) ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
DESTCPU ?= ppc64 DESTCPU ?= ppc64
else else
@ -865,6 +868,7 @@ endif
endif endif
endif endif
endif endif
endif
# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32'). # 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. # pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.