summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-11-24 23:43:44 (GMT)
committer Vincent Sanders <vince@kyllikki.org>2016-11-24 23:45:49 (GMT)
commitf8f802cda5f54c0c2b1acd51efc08aa7d4afad1b (patch)
tree17c2ba6b4dc5084c21f07dbc7e5b9e37baaa603d
parentaf1f1f375d0f0fdaf885f72fdbcd873f2203d227 (diff)
downloadnetsurf-f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b.tar.gz
netsurf-f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b.tar.bz2
inhibit javascipt for native builds on architectures where it miscompiles
-rw-r--r--Makefile17
1 files changed, 15 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f616c6d..2371755 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,6 @@ HOST := $(shell uname -s)
# TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here
HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST))))
-
ifeq ($(HOST),)
HOST := riscos
$(warning Build platform determination failed but that's a known problem for RISC OS so we're assuming a native RISC OS build.)
@@ -300,7 +299,21 @@ else
endif
else
# All native targets
- PKG_CONFIG := pkg-config
+
+ # The machine architecture
+ # Possibles: i386 i686 x86_64 ia64 alpha amd64 arm
+ # armeb armel hppa m32r m68k mips mipsel powerpc ppc64
+ # s390 s390x sh3 sh3eb sh4 sh4eb sparc
+ HOST_ARCH := $(shell uname -m)
+
+ # disable duktape use on architectures where it miscompiles
+ NO_DUKTAPE_ARCH := s390 s390x ppc64
+ ifeq ($(filter-out $(NO_DUKTAPE_ARCH),$(HOST_ARCH)),)
+ override NETSURF_USE_DUKTAPE := NO
+ endif
+
+ # use native package config
+ PKG_CONFIG := pkg-config
# gtk target processing
ifeq ($(TARGET),gtk3)