Merge "With host mulitilib build now we have HOST_IS_64_BIT."
diff --git a/Makefile.android b/Makefile.android
index 586797d..d25f357 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -47,7 +47,7 @@
MY_CFLAGS += -D_WIN32
# LARGEADDRESSAWARE gives more address space to 32-bit process
MY_LDLIBS += -Xlinker --large-address-aware
- ifneq ($(BUILD_HOST_64bit),)
+ ifneq ($(HOST_IS_64_BIT),)
# Microsoft 64-bit compiler define both _WIN32 and _WIN64
MY_CFLAGS += -D_WIN64
# amd64-mingw32msvc- toolchain still name it vfw32. May change it once amd64-mingw32msvc-
@@ -106,7 +106,7 @@
# adequate values for HOST_CC
#
ifneq ($(BUILD_STANDALONE_EMULATOR),true)
- # On Linux, use our custom 32-bit host toolchain (unless BUILD_HOST_64bit=1)
+ # On Linux, use our custom 32-bit host toolchain (unless HOST_IS_64_BIT=true)
# which contains the relevant headers and 32-bit libraries for audio (The host 64-bit
# Lucid doesn't provide these anymore, only their 64-bit versions).
ifeq ($(HOST_OS),linux)
@@ -136,7 +136,7 @@
ifneq ($(combo_target)$(TARGET_SIMULATOR),HOST_true)
- ifneq ($(BUILD_HOST_64bit),)
+ ifneq ($(HOST_IS_64_BIT),)
MY_CFLAGS += -m64
MY_LDFLAGS += -m64
else
diff --git a/Makefile.common b/Makefile.common
index ce35630..786a7f1 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -206,7 +206,7 @@
# On linux-x86, using the prebuilts avoid installing all the X11
# development packages on our build servers. Note: When building 64-bit
# host binaries, don't use 32-bit SDL prebuilts.
-ifeq ($(strip $(QEMU_HOST_TAG)$(BUILD_HOST_64bit)),linux-x86)
+ifeq ($(strip $(QEMU_HOST_TAG)$(HOST_IS_64_BIT)),linux-x86)
BUILD_SDL_FROM_SOURCES := false
endif
@@ -773,4 +773,3 @@
LOCAL_GENERATED_SOURCES += $$(QEMU_HEADER_H)
LOCAL_C_INCLUDES += $$(intermediates)
endef
-
