[Lldb-commits] [lldb] r300045 - Android.rules: setup correct objcopy path

[Pavel Labath via lldb-commits]

Author: labath
Date: Wed Apr 12 05:13:47 2017
New Revision: 300045

URL: http://llvm.org/viewvc/llvm-project?rev=300045&view=rev
Log:
Android.rules: setup correct objcopy path

This fixes a couple of tests when using android clang as a compiler.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules

Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules?rev=300045&r1=300044&r2=300045&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules Wed Apr 12 05:13:47 2017
@@ -46,6 +46,12 @@ else
 	TOOLCHAIN_DIR := $(subst -none,,$(TRIPLE))-4.9
 endif
 
+ifeq "$(ARCH)" "arm"
+	TOOL_PREFIX := arm-linux-androideabi
+else
+	TOOL_PREFIX := $(subst -none,,$(TRIPLE))
+endif
+
 ifeq "$(HOST_OS)" "Linux"
 	HOST_TAG := linux-x86_64
 else ifeq "$(HOST_OS)" "Darwin"
@@ -54,11 +60,13 @@ else
 	HOST_TAG := windows-x86_64
 endif
 
+GCC_TOOLCHAIN = $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG)
+
+OBJCOPY ?= $(GCC_TOOLCHAIN)/bin/$(TOOL_PREFIX)-objcopy
+
 ifeq "$(findstring clang,$(CC))" "clang"
-	ARCH_CFLAGS += -target $(TRIPLE) \
-		-gcc-toolchain $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG)
-	ARCH_LDFLAGS += -target $(TRIPLE) \
-		-gcc-toolchain $(NDK_ROOT)/toolchains/$(TOOLCHAIN_DIR)/prebuilt/$(HOST_TAG)
+	ARCH_CFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN)
+	ARCH_LDFLAGS += -target $(TRIPLE) -gcc-toolchain $(GCC_TOOLCHAIN)
 endif
 
 ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH)