Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db905e7b authored by Dan Albert's avatar Dan Albert
Browse files

Strip my_clang on assignment. 

There were a few cases that my_clang was being used without being
stripped. This was causing uses like the following to fail because it
would be partially applied (use clang as the compiler, but don't strip
out incompatible cflags).

    LOCAL_CLANG := true # explanation

To avoid this problem in the future, just strip my_clang when it is
assigned.

Change-Id: I41c2f36a4d4c3aa305a25b4a151c066dad5ffe0f
parent ce9b58b1

core/binary.mk

+6 −6
Original line number Original line Diff line number Diff line
@@ -133,12 +133,12 @@ my_asflags += $(LOCAL_ASFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $ 
my_c_includes += $(LOCAL_C_INCLUDES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix))

my_c_includes += $(LOCAL_C_INCLUDES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix))

my_generated_sources += $(LOCAL_GENERATED_SOURCES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_GENERATED_SOURCES_$(my_32_64_bit_suffix))

my_generated_sources += $(LOCAL_GENERATED_SOURCES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_GENERATED_SOURCES_$(my_32_64_bit_suffix))





my_clang := $(LOCAL_CLANG)

my_clang := $(strip $(LOCAL_CLANG))

ifdef LOCAL_CLANG_$(my_32_64_bit_suffix)

ifdef LOCAL_CLANG_$(my_32_64_bit_suffix)

my_clang := $(LOCAL_CLANG_$(my_32_64_bit_suffix))

my_clang := $(strip $(LOCAL_CLANG_$(my_32_64_bit_suffix)))

endif

endif

ifdef LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

ifdef LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

my_clang := $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

my_clang := $(strip $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))

endif

endif





# clang is enabled by default for host builds

# clang is enabled by default for host builds
@@ -312,7 +312,7 @@ else 
endif

endif





ifeq ($(strip $(my_cc)),)

ifeq ($(strip $(my_cc)),)

  ifeq ($(strip $(my_clang)),true)

  ifeq ($(my_clang),true)

    my_cc := $(CLANG)

    my_cc := $(CLANG)

  else

  else

    my_cc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CC)

    my_cc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CC)
@@ -328,7 +328,7 @@ endif 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)





ifeq ($(strip $(my_cxx)),)

ifeq ($(strip $(my_cxx)),)

  ifeq ($(strip $(my_clang)),true)

  ifeq ($(my_clang),true)

    my_cxx := $(CLANG_CXX)

    my_cxx := $(CLANG_CXX)

  else

  else

    my_cxx := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CXX)

    my_cxx := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CXX)
@@ -378,7 +378,7 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb) 
# actually used (although they are usually empty).

# actually used (although they are usually empty).

arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)

arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)

normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)

normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)

ifeq ($(strip $(my_clang)),true)

ifeq ($(my_clang),true)

arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))

arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))

normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))

normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))

endif

endif