From ac9eea9463c25d020751c6e53bf08f9a6987a4de Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 20 Aug 2015 16:52:47 -0700 Subject: [PATCH] Fix Linux host checkbuilds. Turns out that thanks to 9d59f417767991246848c3e101cb27d2dfea5988 we actually build *all* the host libraries both 32- and 64-bit. Rather than fix the libraries (or fixing things so we don't build stuff we don't need) right now, let's just put _FILE_OFFSET_BITS and _LARGEFILE_SOURCE back. Change-Id: I6c2d6a6919d1518f775e0d6c050e2c774994c5bd --- core/combo/HOST_linux-x86.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 3acf7957f..8cfdaf5ed 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -46,6 +46,10 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURC # 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 ############################################################