Merge pull request #1647 from belegdol/master

Fixed building on ppc64le
This commit is contained in:
Vas Crabb 2016-11-08 10:04:36 +11:00 committed by GitHub
commit edb90fb9d7

View File

@ -280,6 +280,12 @@ endif
ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64) ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
ARCHITECTURE := _x64 ARCHITECTURE := _x64
endif endif
ifeq ($(firstword $(filter ppc64le,$(UNAME))),ppc64le)
ARCHITECTURE := _x64
endif
ifeq ($(firstword $(filter s390x,$(UNAME))),s390x)
ARCHITECTURE := _x64
endif
endif endif
else else
@ -325,6 +331,12 @@ ifndef NOASM
endif endif
endif endif
ifeq ($(findstring s390x,$(UNAME)),s390x)
ifndef NOASM
NOASM := 1
endif
endif
# Emscripten # Emscripten
ifeq ($(findstring emcc,$(CC)),emcc) ifeq ($(findstring emcc,$(CC)),emcc)
TARGETOS := asmjs TARGETOS := asmjs
@ -342,6 +354,13 @@ BIGENDIAN := 1
endif endif
# Linux # Linux
ifneq (,$(findstring ppc,$(UNAME))) ifneq (,$(findstring ppc,$(UNAME)))
ifneq (,$(findstring ppc64le,$(UNAME)))
BIGENDIAN := 0
else
BIGENDIAN := 1
endif
endif
ifneq (,$(findstring s390x,$(UNAME)))
BIGENDIAN := 1 BIGENDIAN := 1
endif endif
endif # BIGENDIAN endif # BIGENDIAN