From 3feac42ebbdbebc1a311edc27b845387c7da6da7 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh <andrewhsieh@google.com> Date: Mon, 30 Dec 2013 14:51:41 +0800 Subject: [PATCH] Fixed RS to link arch-specific libclcore.bc Change-Id: I581e5350f32b21959d6e1ab964ccf67e4773e916 --- build/core/definitions.mk | 2 +- build/core/setup-app.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/core/definitions.mk b/build/core/definitions.mk index 8e3f0931..80b3002d 100644 --- a/build/core/definitions.mk +++ b/build/core/definitions.mk @@ -1484,7 +1484,7 @@ $$(_OBJ): $$(_RS_SRC) $$(LOCAL_MAKEFILE) $$(NDK_APP_APPLICATION_MK) $$(NDK_DEPEN $$(hide) \ cd $$(call host-path,$$(dir $$(PRIVATE_RS_SRC))) && $$(PRIVATE_RS_CC) -o $$(call host-path,$$(abspath $$(dir $$(PRIVATE_OBJ))))/ -d $$(abspath $$(call host-path,$$(dir $$(PRIVATE_OBJ)))) -MD -reflect-c++ $$(PRIVATE_RS_FLAGS) $$(notdir $$(PRIVATE_RS_SRC)) $$(hide) \ - $$(PRIVATE_RS_BCC) -O3 -o $$(call host-path,$$(PRIVATE_BC_OBJ)) -fPIC -shared -rt-path $$(call host-path,$(RENDERSCRIPT_TOOLCHAIN_LIB)/libclcore.bc) -mtriple $$(PRIVATE_RS_TRIPLE) $$(call host-path,$$(PRIVATE_BC_SRC)) && \ + $$(PRIVATE_RS_BCC) -O3 -o $$(call host-path,$$(PRIVATE_BC_OBJ)) -fPIC -shared -rt-path $$(call host-path,$(SYSROOT_LINK)/usr/lib/rs/libclcore.bc) -mtriple $$(PRIVATE_RS_TRIPLE) $$(call host-path,$$(PRIVATE_BC_SRC)) && \ $$(PRIVATE_CXX) -shared -Wl,-soname,librs.$$(PRIVATE_BC_SO) -nostdlib $$(call host-path,$$(PRIVATE_BC_OBJ)) $$(call host-path,$(SYSROOT_LINK)/usr/lib/rs/libcompiler_rt.a) -o $$(call host-path,$$(PRIVATE_OUT)/librs.$$(PRIVATE_BC_SO)) -L $$(call host-path,$(SYSROOT_LINK)/usr/lib) -L $$(call host-path,$(SYSROOT_LINK)/usr/lib/rs) -lRSSupport -lm -lc && \ $$(PRIVATE_CXX) -MMD -MP -MF $$(call convert-deps,$$(PRIVATE_DEPS)) $$(PRIVATE_CPPFLAGS) $$(call host-path,$$(PRIVATE_CPP_SRC)) -o $$(call host-path,$$(PRIVATE_OBJ)) \ $$(call cmd-convert-deps,$$(PRIVATE_DEPS)) diff --git a/build/core/setup-app.mk b/build/core/setup-app.mk index 6a2bde39..bd126e30 100644 --- a/build/core/setup-app.mk +++ b/build/core/setup-app.mk @@ -110,7 +110,6 @@ endif RENDERSCRIPT_TOOLCHAIN_ROOT := $(NDK_ROOT)/toolchains/renderscript RENDERSCRIPT_TOOLCHAIN_PREBUILT_ROOT := $(call host-prebuilt-tag,$(RENDERSCRIPT_TOOLCHAIN_ROOT)) RENDERSCRIPT_TOOLCHAIN_PREFIX := $(RENDERSCRIPT_TOOLCHAIN_PREBUILT_ROOT)/bin/ -RENDERSCRIPT_TOOLCHAIN_LIB := $(RENDERSCRIPT_TOOLCHAIN_PREBUILT_ROOT)/lib RENDERSCRIPT_TOOLCHAIN_HEADER := $(RENDERSCRIPT_TOOLCHAIN_PREBUILT_ROOT)/lib/clang/3.3/include # Each ABI -- GitLab