diff options
author | Justin Kerk <dopefishjustin@gmail.com> | 2016-03-10 15:35:30 +0000 |
---|---|---|
committer | Justin Kerk <dopefishjustin@gmail.com> | 2016-03-10 15:35:30 +0000 |
commit | 7346a874a3a6e6610991bdce9fb10ba645d63816 (patch) | |
tree | 368d14df0955611a3ab7cc7579bc01965950c308 | |
parent | c3bad4a577181d145679ff672550edebfa4e4649 (diff) |
Fix Emscripten build when Clang is the default compiler (issue #704) (nw)
-rw-r--r-- | makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -799,16 +799,20 @@ CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/nu endif PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python) endif + ifeq ($(CLANG_VERSION),) $(info GCC $(GCC_VERSION) detected) else $(info Clang $(CLANG_VERSION) detected) +ifneq ($(TARGETOS),asmjs) ifeq ($(ARCHITECTURE),_x64) ARCHITECTURE := _x64_clang else ARCHITECTURE := _x86_clang endif endif +endif + ifneq ($(PYTHON_AVAILABLE),python) $(error Python is not available in path) endif |