diff options
author | Ying Wang <wangying@google.com> | 2014-02-21 16:17:05 -0800 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2014-02-21 16:20:20 -0800 |
commit | 9fb3526648a08d8d8c1e6325aeb3c6500bcd44c2 (patch) | |
tree | dd9df8fb9098a428c30478bc9e561cda9d8acacd /core/executable_internal.mk | |
parent | b3bc61365bb71cc45d10c22762aa86a3b78f1329 (diff) | |
download | build-9fb3526648a08d8d8c1e6325aeb3c6500bcd44c2.zip build-9fb3526648a08d8d8c1e6325aeb3c6500bcd44c2.tar.gz build-9fb3526648a08d8d8c1e6325aeb3c6500bcd44c2.tar.bz2 |
Make -rpath-link work with multilib.
Change-Id: If69ea6ed6cdbb657ed4005f8217d653e29626783
Diffstat (limited to 'core/executable_internal.mk')
-rw-r--r-- | core/executable_internal.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/executable_internal.mk b/core/executable_internal.mk index f2cb4a9..1edcd2c 100644 --- a/core/executable_internal.mk +++ b/core/executable_internal.mk @@ -57,6 +57,7 @@ $(linked_module): PRIVATE_TARGET_LIBGCC := $(my_target_libgcc) $(linked_module): PRIVATE_TARGET_CRTBEGIN_DYNAMIC_O := $(my_target_crtbegin_dynamic_o) $(linked_module): PRIVATE_TARGET_CRTBEGIN_STATIC_O := $(my_target_crtbegin_static_o) $(linked_module): PRIVATE_TARGET_CRTEND_O := $(my_target_crtend_o) +$(linked_module): PRIVATE_TARGET_OUT_INTERMEDIATE_LIBRARIES := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES) ifeq ($(LOCAL_FORCE_STATIC_EXECUTABLE),true) $(linked_module): $(my_target_crtbegin_static_o) $(all_objects) $(all_libraries) $(my_target_crtend_o) |