Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 24b9d29

Browse filesBrowse files
bnoordhuistargos
authored andcommitted
build: uname -m is amd64 on freebsd, not x86_64
Fixes: #13150 PR-URL: #28804 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent c0a0448 commit 24b9d29
Copy full SHA for 24b9d29

File tree

Expand file treeCollapse file tree

1 file changed

+4
-0
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-0
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,9 @@ UNAME_M=$(shell uname -m)
806806
ifeq ($(findstring x86_64,$(UNAME_M)),x86_64)
807807
DESTCPU ?= x64
808808
else
809+
ifeq ($(findstring amd64,$(UNAME_M)),amd64)
810+
DESTCPU ?= x64
811+
else
809812
ifeq ($(findstring ppc64,$(UNAME_M)),ppc64)
810813
DESTCPU ?= ppc64
811814
else
@@ -865,6 +868,7 @@ endif
865868
endif
866869
endif
867870
endif
871+
endif
868872

869873
# node and v8 use different arch names (e.g. node 'x86' vs v8 'ia32').
870874
# pass the proper v8 arch name to $V8_ARCH based on user-specified $DESTCPU.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.