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

* commit '506857e974ed1aac60bff96a71d0eb182865bed8':
  Make linker configurable through environment.
This commit is contained in:
Nicolas Geoffray
2015-09-29 09:04:59 +00:00
committed by Android Git Automerger

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