diff options
| author | Ying Wang <wangying@google.com> | 2014-05-20 14:43:51 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-05-20 18:03:21 -0700 |
| commit | 966c1e0cae6a59f15264d3b542af08e21e2dc06c (patch) | |
| tree | fc310007c15dd5de89d3fc7b3fe8eb6212039076 /core/envsetup.mk | |
| parent | 4e151105a02ba09acb277c6a084252d01c561a5f (diff) | |
| download | build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.zip build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.tar.gz build-966c1e0cae6a59f15264d3b542af08e21e2dc06c.tar.bz2 | |
Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build
We already support pure 32-bit and 64-bit-by-default multilib build.
With HOST_PREFER_32_BIT we can build 32-bit-by-default multilib build.
This will be lest disruptive during the period we transition to
64-bit-by-default.
Bug: 13751317
Change-Id: I0d56ce4abbe4afeaacfd70d709f6a349791c0722
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index df76c51..a228fc7 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -67,6 +67,10 @@ ifeq ($(HOST_OS),) $(error Unable to determine HOST_OS from uname -sm: $(UNAME)!) endif +ifeq ($(HOST_PREFER_32_BIT),true) +# User asks for multilib build, but use 32-bit as preferred arch. +BUILD_HOST_64bit := true +endif # HOST_ARCH ifneq (,$(findstring x86_64,$(UNAME))) @@ -228,7 +232,13 @@ HOST_2ND_ARCH_VAR_PREFIX := 2ND_ HOST_2ND_ARCH_MODULE_SUFFIX := _32 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES := $(HOST_OUT)/obj32 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib +ifeq ($(HOST_PREFER_32_BIT),true) +# To keep path compatibility, put 32-bit libs in lib/ and 64-bit libs in lib64/. +HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64 +$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib +else $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib32 +endif $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES) |