diff options
| author | Ying Wang <wangying@google.com> | 2014-06-09 12:31:12 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-09 17:48:05 -0700 |
| commit | 2713fcebbae97c6132c9fa61b8db795d29813dc6 (patch) | |
| tree | 95f27e5979d78165e0f9daa2648e1fe16141c7be /core/envsetup.mk | |
| parent | c02752473f958cb1b23ca2f7d3fd1973b665e3c4 (diff) | |
| download | build-2713fcebbae97c6132c9fa61b8db795d29813dc6.zip build-2713fcebbae97c6132c9fa61b8db795d29813dc6.tar.gz build-2713fcebbae97c6132c9fa61b8db795d29813dc6.tar.bz2 | |
Switch to 32-bit-by-default host multilib build.
Also we don't need to force LLVM built from source, for we already force
LLVM to be built as 32-bit.
Bug: 13751317
Change-Id: Ifadf1988d28b60cb06316de50f5bdc1834f1acc0
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index a228fc7..8013e18 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -67,28 +67,32 @@ ifeq ($(HOST_OS),) $(error Unable to determine HOST_OS from uname -sm: $(UNAME)!) endif +# TODO: Replace BUILD_HOST_64bit with a flag that forces 32-bit build, +# after we default to 64-bit host build. +ifeq (,$(BUILD_HOST_64bit)) +# Default to 32-bit-by-default multilib host build. +HOST_PREFER_32_BIT := true ifeq ($(HOST_PREFER_32_BIT),true) -# User asks for multilib build, but use 32-bit as preferred arch. BUILD_HOST_64bit := true endif +endif # HOST_ARCH ifneq (,$(findstring x86_64,$(UNAME))) - # TODO: Replace BUILD_HOST_64bit with a flag that forces 32-bit build, - # after we default to 64-bit host build. - ifeq (,$(BUILD_HOST_64bit)) - HOST_ARCH := x86 - HOST_2ND_ARCH := - else - HOST_ARCH := x86_64 - HOST_2ND_ARCH := x86 - endif + HOST_ARCH := x86_64 + HOST_2ND_ARCH := x86 else ifneq (,$(findstring 86,$(UNAME))) # It's not officially supported! HOST_ARCH := x86 HOST_2ND_ARCH := endif +ifeq ($(HOST_PREFER_32_BIT),true) +SDK_HOST_ARCH := x86 +else +SDK_HOST_ARCH := $(HOST_ARCH) +endif + BUILD_ARCH := $(HOST_ARCH) BUILD_2ND_ARCH := $(HOST_2ND_ARCH) |