From 58dde95d078c5906a2e5e8811d6c2e86e9a1f3c1 Mon Sep 17 00:00:00 2001 From: Tiago Pierezan Camargo Date: Tue, 12 Nov 2019 07:29:09 -0300 Subject: workaround to fix cross compilation to x86 from a x64 host --- makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/makefile b/makefile index d51272121ba..3567a4d9529 100644 --- a/makefile +++ b/makefile @@ -293,6 +293,21 @@ else UNAME := $(shell uname -mps) TARGETOS := $(OS) +#------------------------------------------------- +# determine the whether -m32, -m64 or nothing +# should be passed to gcc when building genie +#------------------------------------------------- + +ifeq ($(ARCHITECTURE),_x86) +MPARAM := -m32 +else +ifeq ($(ARCHITECTURE),_x64) +MPARAM := -m64 +else +MPARAM := +endif +endif + ARCHITECTURE := _x86 ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64) @@ -405,21 +420,6 @@ CC := $(SILENT)gcc LD := $(SILENT)g++ CXX:= $(SILENT)g++ -#------------------------------------------------- -# determine the whether -m32, -m64 or nothing -# should be passed to gcc when building genie -#------------------------------------------------- - -ifeq ($(ARCHITECTURE),_x86) -MPARAM := -m32 -else -ifeq ($(ARCHITECTURE),_x64) -MPARAM := -m64 -else -MPARAM := -endif -endif - #------------------------------------------------- # specify OSD layer: windows, sdl, etc. # build scripts will be run from -- cgit v1.2.3