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

am 2f9fa520: Merge "Fix build breakage due to incorrect bcc_compat RS_TRIPLE." 

* commit '2f9fa5202532fb2b5c9ea89a4c15171346f63ec1':
  Fix build breakage due to incorrect bcc_compat RS_TRIPLE.
This commit is contained in:
Stephen Hines 2014-09-03 16:09:03 +00:00 committed by Android Git Automerger
parent 067dd37952 2f9fa52025
commit 22270a7d68
7 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/clang/TARGET_arm.mk
View File

@ -54,3 +54,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi

1
core/clang/TARGET_arm64.mk
View File

@ -52,3 +52,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
RS_TRIPLE := aarch64-linux-android
RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := aarch64-linux-android

1
core/clang/TARGET_mips.mk
View File

@ -52,3 +52,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := mipsel-linux-android

1
core/clang/TARGET_mips64.mk
View File

@ -52,3 +52,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
RS_TRIPLE := aarch64-linux-android
RS_TRIPLE_CFLAGS :=
RS_COMPAT_TRIPLE := mips64el-linux-android

1
core/clang/TARGET_x86.mk
View File

@ -54,3 +54,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \
$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__
RS_COMPAT_TRIPLE := i686-linux-android

1
core/clang/TARGET_x86_64.mk
View File

@ -52,3 +52,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
RS_TRIPLE := aarch64-linux-android
RS_TRIPLE_CFLAGS := -D__x86_64__
RS_COMPAT_TRIPLE := x86_64-linux-android

2
core/definitions.mk
View File

@ -879,7 +879,7 @@ define transform-bc-to-so
@echo "Renderscript compatibility: $(notdir $@) <= $(notdir $<)"
$(hide) mkdir -p $(dir $@)
$(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \
-rt-path $(RS_PREBUILT_CLCORE) -mtriple $(RS_TRIPLE) $<
-rt-path $(RS_PREBUILT_CLCORE) -mtriple $(RS_COMPAT_TRIPLE) $<
$(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
-Wl,-rpath,\$$ORIGIN/../lib \
$(dir $@)/$(notdir $(<:.bc=.o)) \