summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2015-07-16 22:54:34 +0200
committer Julian Sikorski <belegdol+github@gmail.com>2015-07-16 22:54:34 +0200
commitd4ec50198c75fea966ce23f3c02ee5cf61a9cdfe (patch)
tree71aa63109d7984961525b2e6ff494861736692f8
parent821be229837ce36eaf305c61af7e725ddd1ec703 (diff)
Do not pass -m32 to gcc on arm
-rw-r--r--makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/makefile b/makefile
index 04d0a748baf..68e610dcc69 100644
--- a/makefile
+++ b/makefile
@@ -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
#-------------------------------------------------