commit 1d090fc0cef4fd212ac3077a198537f05064b95a
author Dan Willemsen <dwillemsen@google.com> Tue Aug 28 01:51:25 2018 -0700
committer Dan Willemsen <dwillemsen@google.com> Tue Aug 28 13:21:42 2018 -0700
tree 6eef11ac218c12db0283a07410f071b8b9180255
parent 7c76579e7ae4aab9d9a6923b7148f97793c2f0e2

Disable 32-bit Darwin builds

Mac OSX 10.14 Mojave deprecates 32-bit executables, and the 10.14 SDK
does not successfully link 32-bit files.

Test: Install Xcode 10 beta, `m checkbuild host`
Change-Id: Ifad471fb88ead4bda870f49837d937fb5742f3f6

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 39b9552..161080b 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -147,6 +147,11 @@
 endif
 endif
 
+ifeq ($(HOST_OS),darwin)
+  # Mac no longer supports 32-bit executables
+  HOST_2ND_ARCH :=
+endif
+
 BUILD_ARCH := $(HOST_ARCH)
 BUILD_2ND_ARCH := $(HOST_2ND_ARCH)