Fix RS_TRIPLE and RS_TRIPLE_CFLAGS.
Bug: 17333374 Add RS_TRIPLE_CFLAGS to ensure that we build with the proper defines on targets like x86. This also changes all build targets to use the proper 32/64-bit triples when creating their runtime libraries. Change-Id: I8f6175b1a14af6d03ee90f32069f3688ec227fb9
This commit is contained in:
parent
d0015f7173
commit
039675adb8
|
@ -53,3 +53,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|||
$(CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS)
|
||||
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
|
||||
|
|
|
@ -51,3 +51,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|||
$(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS)
|
||||
|
||||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE_CFLAGS :=
|
||||
|
|
|
@ -50,4 +50,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|||
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \
|
||||
$(CLANG_CONFIG_mips_TARGET_EXTRA_LDFLAGS)
|
||||
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := mipsel-unknown-linux
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
|
||||
|
|
|
@ -50,4 +50,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|||
$(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \
|
||||
$(CLANG_CONFIG_mips64_TARGET_EXTRA_LDFLAGS)
|
||||
|
||||
RS_TRIPLE := mips64el-unknown-linux
|
||||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE_CFLAGS :=
|
||||
|
|
|
@ -52,4 +52,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|||
$(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \
|
||||
$(CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS)
|
||||
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := i686-unknown-linux
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
|
||||
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
|
||||
|
|
|
@ -50,4 +50,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
|
|||
$(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \
|
||||
$(CLANG_CONFIG_x86_64_TARGET_EXTRA_LDFLAGS)
|
||||
|
||||
RS_TRIPLE := x86_64-unknown-linux
|
||||
RS_TRIPLE := aarch64-linux-android
|
||||
RS_TRIPLE_CFLAGS := -D__x86_64__
|
||||
|
|
Loading…
Reference in New Issue