diff options
| author | Ying Wang <wangying@google.com> | 2014-06-30 17:06:21 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-30 17:06:21 -0700 |
| commit | 36ef50f2a2e2de4ee568a94e9bb06813542a0ca1 (patch) | |
| tree | ac99d15717f876161e9cb6af7dc9a47a5c3fdc08 | |
| parent | 51254e6c6065c0c771886472853e6dbc5377c6ae (diff) | |
| download | build-36ef50f2a2e2de4ee568a94e9bb06813542a0ca1.tar.gz | |
More consistent host library path in multilib build.
In 64-bit multilib host build, changed from
32-bit lib: out/host/<platform>/lib32
64-bit lib: out/host/<platform>/lib
to
32-bit lib: out/host/<platform>/lib
64-bit lib: out/host/<platform>/lib64
.
That way the host library path is consistent with the multilib target
build's. Also with this change prebuilt 32-bit libraries can be reused
in 64-bit host build as 2nd arch binaries. (With previous setup, they
can't be used because they have rpath ../lib in it while the 2nd arch
library path needs ../lib32.
Change-Id: I020199d0c7dd52cdc8dcb7d3a1d22cd6178672e1
| -rw-r--r-- | core/envsetup.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 196251328d..9caf7c0069 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -218,7 +218,11 @@ OUT_DOCS := $(TARGET_COMMON_OUT_ROOT)/docs BUILD_OUT_EXECUTABLES := $(BUILD_OUT)/bin HOST_OUT_EXECUTABLES := $(HOST_OUT)/bin +ifeq (x86_64,$(HOST_ARCH)) +HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib64 +else HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib +endif HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT)/framework HOST_OUT_SDK_ADDON := $(HOST_OUT)/sdk_addon @@ -236,13 +240,7 @@ 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) # The default host library path. |