openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix build breakage due to incorrect bcc_compat RS_TRIPLE. 

Bug: 17333374
Change-Id: I13582ce0cde86f7b3728aa4f45a5197438d65a2d
This commit is contained in:
Stephen Hines 2014-09-02 19:09:35 -07:00
parent 41b83d6d3c
commit 52626d2a7b
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 := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := $(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 := aarch64-linux-android
RS_TRIPLE_CFLAGS := 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 := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := $(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 := aarch64-linux-android
RS_TRIPLE_CFLAGS := 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 := armv7-none-linux-gnueabi
$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__ $(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 := aarch64-linux-android
RS_TRIPLE_CFLAGS := -D__x86_64__ 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 $<)" @echo "Renderscript compatibility: $(notdir $@) <= $(notdir $<)"
$(hide) mkdir -p $(dir $@) $(hide) mkdir -p $(dir $@)
$(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \ $(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 \ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
-Wl,-rpath,\$$ORIGIN/../lib \ -Wl,-rpath,\$$ORIGIN/../lib \
$(dir $@)/$(notdir $(<:.bc=.o)) \ $(dir $@)/$(notdir $(<:.bc=.o)) \