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

Commit d121d417 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 90ed06ef: Merge "fix 2nd target clang prebuilt paths" 

* commit '90ed06ef':
  fix 2nd target clang prebuilt paths
parents 484c7dec 90ed06ef

core/clang/TARGET_arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ include $(BUILD_SYSTEM)/clang/arm.mk 


CLANG_CONFIG_arm_TARGET_TRIPLE := arm-linux-androideabi

CLANG_CONFIG_arm_TARGET_TOOLCHAIN_PREFIX := \

  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin

  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_arm_TARGET_TRIPLE)/bin



CLANG_CONFIG_arm_TARGET_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/TARGET_mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ include $(BUILD_SYSTEM)/clang/mips.mk 


CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android

CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \

  $(TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin

  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin



CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \

core/clang/TARGET_x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ include $(BUILD_SYSTEM)/clang/x86.mk 


CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android

CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \

  $(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin

  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin



CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS := \

  $(CLANG_CONFIG_EXTRA_ASFLAGS) \