diff options
| author | Stephen Hines <srhines@google.com> | 2014-09-02 19:09:35 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-09-02 21:46:25 -0700 |
| commit | 5c72544d48362a24d25eaad608e371dd30afd56f (patch) | |
| tree | 0c1f3014ff2d6cc83592ffaa448be7a3b748551d | |
| parent | ec8778e89f872b9a12cc6b3367400ecd33cb32d0 (diff) | |
| download | build-5c72544d48362a24d25eaad608e371dd30afd56f.zip build-5c72544d48362a24d25eaad608e371dd30afd56f.tar.gz build-5c72544d48362a24d25eaad608e371dd30afd56f.tar.bz2 | |
Fix build breakage due to incorrect bcc_compat RS_TRIPLE.
Bug: 17333374
Change-Id: I13582ce0cde86f7b3728aa4f45a5197438d65a2d
(cherry picked from commit 52626d2a7b4767905e8a369ddc8316c1290ad156)
| -rw-r--r-- | core/clang/TARGET_arm.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_arm64.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_mips.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_mips64.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_x86.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_x86_64.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 2 |
7 files changed, 7 insertions, 1 deletions
diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index 575b9f9..59ed41f 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -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 diff --git a/core/clang/TARGET_arm64.mk b/core/clang/TARGET_arm64.mk index 0264321..6f9e540 100644 --- a/core/clang/TARGET_arm64.mk +++ b/core/clang/TARGET_arm64.mk @@ -52,3 +52,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := +RS_COMPAT_TRIPLE := aarch64-linux-android diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index 011c2a6..91067f5 100644 --- a/core/clang/TARGET_mips.mk +++ b/core/clang/TARGET_mips.mk @@ -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 diff --git a/core/clang/TARGET_mips64.mk b/core/clang/TARGET_mips64.mk index a5e29d2..ab69aed 100644 --- a/core/clang/TARGET_mips64.mk +++ b/core/clang/TARGET_mips64.mk @@ -52,3 +52,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := +RS_COMPAT_TRIPLE := mips64el-linux-android diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk index da7a223..60ee06f 100644 --- a/core/clang/TARGET_x86.mk +++ b/core/clang/TARGET_x86.mk @@ -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 diff --git a/core/clang/TARGET_x86_64.mk b/core/clang/TARGET_x86_64.mk index cc1f59f..5561e42 100644 --- a/core/clang/TARGET_x86_64.mk +++ b/core/clang/TARGET_x86_64.mk @@ -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 diff --git a/core/definitions.mk b/core/definitions.mk index 9b8a299..74fa038 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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)) \ |