commit 6f5341259c6b6684acb4e91d9220593c231abecd
author Elliott Hughes <enh@google.com> Thu Aug 20 23:56:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 20 23:56:07 2015 +0000
tree 42488bd74080c5a9d6b76422d8b4310f41d917aa
parent a3fa59b12b7346b3d0fbb8c60f890e50c7f51f18
parent ac9eea9463c25d020751c6e53bf08f9a6987a4de

Merge "Fix Linux host checkbuilds."

core/combo/HOST_linux-x86.mk

diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 5a918df..6ea526c 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -45,6 +45,10 @@
 # See bug 12708004.
 $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS
 
+# We build a 32-bit host art, and right now that also means building *all* host libraries
+# both 32- and 64-bit (whether art uses them or not --- 9d59f417767991246848c3e101cb27d2dfea5988).
+$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1
+
 $(combo_2nd_arch_prefix)HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
 
 ############################################################