From 3f3b154419f8f7accb6f3ea1e8694fc4e87db7dd Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 24 Mar 2016 13:27:06 -0700 Subject: [PATCH] Fix the 32-bit Windows host tag. Bug: https://github.com/android-ndk/ndk/issues/45 Change-Id: I4d7f40d6f5609b0067cd89d2b2b75f1195c360bf --- build/core/init.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/core/init.mk b/build/core/init.mk index 2d30cac0d..9a241f97f 100644 --- a/build/core/init.mk +++ b/build/core/init.mk @@ -299,8 +299,15 @@ ifeq ($(HOST_TAG),windows-x86) $(call __ndk_error,Aborting.) endif endif + # special-case the host-tag HOST_TAG := windows + + # For 32-bit systems, HOST_TAG == HOST_TAG64. Make sure that remains true + # here. + ifeq ($(HOST_TAG64),x86) + HOST_TAG64 = $(HOST_TAG) + endif endif $(call ndk_log,HOST_TAG set to $(HOST_TAG))