From 0823ad3300e7c22ef445c5c5f82ab37f36b2c612 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 20 Aug 2015 11:10:22 -0700 Subject: [PATCH] Also -DWIN32 to keep llvm building. Change-Id: Ic8e70f35dda23226d60010a38cf5633840772310 --- core/combo/HOST_windows-x86.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/combo/HOST_windows-x86.mk b/core/combo/HOST_windows-x86.mk index 573d93668c..8441a0d56a 100644 --- a/core/combo/HOST_windows-x86.mk +++ b/core/combo/HOST_windows-x86.mk @@ -37,6 +37,9 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D_WIN32_WINNT=0x0500 # Get 64-bit off_t and related functions. $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 +# An Android-specific hack in llvm currently uses WIN32 rather than _WIN32. +# Until we know whether there are more of these, unconditionally define WIN32. +$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -DWIN32 $(combo_2nd_arch_prefix)HOST_CC := $(TOOLS_PREFIX)gcc$(TOOLS_EXE_SUFFIX) $(combo_2nd_arch_prefix)HOST_CXX := $(TOOLS_PREFIX)g++$(TOOLS_EXE_SUFFIX)