commit f3ff93d7f7d1e9adaede27e11c1e2ca5c9ca8143
author Lai Wei-Chih <Robert.Lai@mediatek.com> Thu Sep 12 10:23:18 2013 +0800
committer Lai Wei-Chih <Robert.Lai@mediatek.com> Mon Sep 16 10:50:35 2013 +0800
tree 69baacff537f4f6f48be3ed6eb9d2b0b689eba3f
parent 0f5c91926653588a6811e633fcfc9b15f6ef2e5f

Add -Wl,-link-native-binary.

Change-Id: Ia7bdceafa17b794823f6f60a8ba97492f3f79ce4

tests/run-tests.sh

diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index a6a4b06..9606d4c 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -298,6 +298,14 @@
 BUILD_DIR=$TEST_DIR/build
 mkdir -p "$BUILD_DIR" && rm -rf "$BUILD_DIR/*"
 
+#
+# Add -link-native-binary to allow linking native binaries
+#
+if [ ! -z "$NDK_ABI_FILTER" ]; then
+  APP_LDFLAGS="$APP_LDFLAGS -Wl,-link-native-binary"
+fi
+
+
 ###
 ### RUN AWK TESTS
 ###

toolchains/llvm-3.3/setup-common.mk

diff --git a/toolchains/llvm-3.3/setup-common.mk b/toolchains/llvm-3.3/setup-common.mk
index 237c133..f09797a 100644
--- a/toolchains/llvm-3.3/setup-common.mk
+++ b/toolchains/llvm-3.3/setup-common.mk
@@ -45,7 +45,7 @@
 TARGET_NO_EXECUTE_CFLAGS :=
 
 # Add and LDFLAGS for the target here
-TARGET_LDFLAGS := \
+TARGET_LDFLAGS += \
     -target $(LLVM_TRIPLE) \
     -emit-llvm \
     -no-canonical-prefixes

toolchains/llvm-3.3/setup.mk

diff --git a/toolchains/llvm-3.3/setup.mk b/toolchains/llvm-3.3/setup.mk
index ce45980..cddcb01 100644
--- a/toolchains/llvm-3.3/setup.mk
+++ b/toolchains/llvm-3.3/setup.mk
@@ -29,6 +29,7 @@
 SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
 TARGET_ARCH_ABI  := armeabi-v7a
+TARGET_LDFLAGS   += -Wl,-link-native-binary
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
 
 TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/arm-linux-androideabi-$(TOOLCHAIN_VERSION))
@@ -41,6 +42,7 @@
 SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-arm/gdbserver/gdbserver
 TARGET_ARCH_ABI  := armeabi
+TARGET_LDFLAGS   += -Wl,-link-native-binary
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
 
 TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/arm-linux-androideabi-$(TOOLCHAIN_VERSION))
@@ -53,6 +55,7 @@
 SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-x86
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-x86/gdbserver/gdbserver
 TARGET_ARCH_ABI  := x86
+TARGET_LDFLAGS   += -Wl,-link-native-binary
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
 
 TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/x86-$(TOOLCHAIN_VERSION))
@@ -65,6 +68,7 @@
 SYSROOT_LINK     := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-mips
 TARGET_GDBSERVER := $(NDK_ROOT)/prebuilt/android-mips/gdbserver/gdbserver
 TARGET_ARCH_ABI  := mips
+TARGET_LDFLAGS   += -Wl,-link-native-binary
 NDK_APP_DST_DIR  := $(NDK_APP_PROJECT_PATH)/libs/$(TARGET_ARCH_ABI)
 
 TARGET_PREBUILT_ROOT = $(call host-prebuilt-tag,$(NDK_ROOT)/toolchains/mipsel-linux-android-$(TOOLCHAIN_VERSION))