StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add HOST_PREFER_32_BIT to support 32-bit-by-default multilib build

Browse Source 
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
This commit is contained in:
Ying Wang
2014-05-20 14:43:51 -07:00
parent 4e151105a0
commit 966c1e0cae
11 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/envsetup.mk
View File

@@ -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)