p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3f054bdd: am 506857e9: Merge "Make linker configurable through environment." 

* commit '3f054bdd0d8201c6ebc7f5037a3af685d8eb8062':
  Make linker configurable through environment.
This commit is contained in:
Nicolas Geoffray 2015-09-29 09:08:40 +00:00 committed by Android Git Automerger
parent 63fad193a5 3f054bdd0d
commit 9be13a763c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/binary.mk
View File

@ -230,7 +230,11 @@ $(foreach lib, $(LOCAL_HAL_STATIC_LIBRARIES), \
b_lib :=
endif
my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LINKER)
ifneq ($(strip $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)),)
my_linker := $(CUSTOM_$(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)LINKER)
else
my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_LINKER)
endif
include $(BUILD_SYSTEM)/config_sanitizers.mk