Merge pull request #260 from belegdol/master

Do not pass -m32 to gcc on arm
This commit is contained in:
R. Belmont 2015-07-19 16:20:28 -07:00
commit efe00cd202

View File

@ -240,6 +240,7 @@ endif
endif
ifeq ($(findstring arm,$(UNAME)),arm)
ARCHITECTURE :=
ifndef NOASM
NOASM := 1
endif
@ -903,13 +904,14 @@ $(PROJECTDIR)/gmake-linux/Makefile: makefile $(SCRIPTS) $(GENIE)
linux_x64: generate $(PROJECTDIR)/gmake-linux/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-linux config=$(CONFIG)64
.PHONY: linux
linux: linux_x86
.PHONY: linux_x86
linux_x86: generate $(PROJECTDIR)/gmake-linux/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-linux config=$(CONFIG)32
.PHONY: linux
linux: generate $(PROJECTDIR)/gmake-linux/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-linux config=$(CONFIG)
#-------------------------------------------------
# gmake-linux-clang
#-------------------------------------------------