StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build the target side of the simulator as 32-bit.

Browse Source 
This detail got lost in my previous cleanup change 9b4a812.

Also add a comment explaining why the host side of the
simulator needs to be built in 64-bit (wxWidgets).

Change-Id: I2a867f7f80b43d53e73348b19f6ae834600295f9
This commit is contained in:
Andy McFadden
2010-02-24 08:29:39 -08:00
committed by Jean-Baptiste Queru
parent 5217f4db12
commit 16e95bb99d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/combo/HOST_linux-x86.mk
View File

@@ -22,9 +22,12 @@ define get-file-size
stat --format "%s" "$(1)" | tr -d '\n' stat --format "%s" "$(1)" | tr -d '\n'
endef endef
# The emulator is 32-bit-only. Force host tools to be built # We build everything in 32-bit, because some host tools are
# in 32-bit when the emulator is involved. # 32-bit-only anyway (emulator, acc), and because it gives us
# Why we don't also force simulator builds to be 32-bit is a mystery. # more consistency between the host tools and the target.
# The exception is the host side of the simulator, which
# requires to use the default size, as wxWidgets code otherwise
# fails to build.
ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_SIMULATOR),true)
HOST_GLOBAL_CFLAGS += -m32 HOST_GLOBAL_CFLAGS += -m32
HOST_GLOBAL_LDFLAGS += -m32 HOST_GLOBAL_LDFLAGS += -m32

4
core/combo/TARGET_linux-x86.mk
View File

@@ -22,8 +22,8 @@ ifeq ($(TARGET_SIMULATOR),true)
TARGET_CC := $(HOST_CC) TARGET_CC := $(HOST_CC)
TARGET_CXX := $(HOST_CXX) TARGET_CXX := $(HOST_CXX)
TARGET_AR := $(HOST_AR) TARGET_AR := $(HOST_AR)
TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) TARGET_GLOBAL_CFLAGS := $(HOST_GLOBAL_CFLAGS) -m32
TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) TARGET_GLOBAL_LDFLAGS := $(HOST_GLOBAL_LDFLAGS) -m32
TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS) TARGET_NO_UNDEFINED_LDFLAGS := $(HOST_NO_UNDEFINED_LDFLAGS)
else #simulator else #simulator