summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2016-11-08 10:04:36 +1100
committer GitHub <noreply@github.com>2016-11-08 10:04:36 +1100
commitedb90fb9d74ad455c244ed316aee89eaf5b1a2bc (patch)
tree583599c87dcf94f568c23501b74062db7b92d615
parent3b512b0fd83b09f279ed15ec460903d710711fa2 (diff)
parente7bbbf4f453ea4da229ebd4a72726fc58540ecb9 (diff)
Merge pull request #1647 from belegdol/master
Fixed building on ppc64le
-rw-r--r--makefile19
1 files changed, 19 insertions, 0 deletions
diff --git a/makefile b/makefile
index adf1467ffc8..dcfb3aa0ce8 100644
--- a/makefile
+++ b/makefile
@@ -280,6 +280,12 @@ endif
ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
ARCHITECTURE := _x64
endif
+ifeq ($(firstword $(filter ppc64le,$(UNAME))),ppc64le)
+ARCHITECTURE := _x64
+endif
+ifeq ($(firstword $(filter s390x,$(UNAME))),s390x)
+ARCHITECTURE := _x64
+endif
endif
else
@@ -325,6 +331,12 @@ ifndef NOASM
endif
endif
+ifeq ($(findstring s390x,$(UNAME)),s390x)
+ifndef NOASM
+ NOASM := 1
+endif
+endif
+
# Emscripten
ifeq ($(findstring emcc,$(CC)),emcc)
TARGETOS := asmjs
@@ -342,6 +354,13 @@ BIGENDIAN := 1
endif
# Linux
ifneq (,$(findstring ppc,$(UNAME)))
+ifneq (,$(findstring ppc64le,$(UNAME)))
+BIGENDIAN := 0
+else
+BIGENDIAN := 1
+endif
+endif
+ifneq (,$(findstring s390x,$(UNAME)))
BIGENDIAN := 1
endif
endif # BIGENDIAN