workaround to fix cross compilation to x86 from a x64 host

This commit is contained in:
Tiago Pierezan Camargo 2019-11-12 07:29:09 -03:00 committed by Vas Crabb
parent f47c225bd5
commit 58dde95d07

View File

@ -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