Skip to content

Commit

Permalink
Define all other architectures as "not x86"
Browse files Browse the repository at this point in the history
This allows the build to proceed for AArch64 (mentioned in #10791) and others.

(cherry picked from commit f244fb6)
ref #13558
  • Loading branch information
ginggs authored and tkelman committed Oct 31, 2015
1 parent 085a985 commit 57ab2f6
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions Make.inc
Expand Up @@ -525,14 +525,9 @@ ISX86=1
else ifeq ($(ARCH),x86_64)
BINARY=64
ISX86=1
else ifneq (,$(findstring arm,$(ARCH)))
ISX86=0
else ifneq (,$(findstring powerpc,$(ARCH)))
ISX86=0
else ifneq (,$(findstring ppc,$(ARCH)))
ISX86=0
else
$(error "unknown word-size for arch: $(ARCH)")
# For all other architectures (ARM, PPC, AArch64, etc.)
ISX86=0
endif

# If we are running on ARM, set certain options automatically
Expand Down

0 comments on commit 57ab2f6

Please sign in to comment.