diff options
| author | Pavel Labath <labath@google.com> | 2017-04-12 10:13:47 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2017-04-12 10:13:47 +0000 |
| commit | efe4e412ad3609a9cefaaee6584aaa34b9e64826 (patch) | |
| tree | 3a04fe7a9893d437a4f800c3cb5bf6a143000716 /lldb/packages/Python/lldbsuite/test/make | |
| parent | baf04f92bcf11bb8adc1200b3537f64a19a4136c (diff) | |
| download | bcm5719-llvm-efe4e412ad3609a9cefaaee6584aaa34b9e64826.tar.gz bcm5719-llvm-efe4e412ad3609a9cefaaee6584aaa34b9e64826.zip | |
Android.rules: setup correct objcopy path
This fixes a couple of tests when using android clang as a compiler.
llvm-svn: 300045
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Android.rules | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Android.rules b/lldb/packages/Python/lldbsuite/test/make/Android.rules index 634f8660c72..3e6a093f4ba 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Android.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Android.rules @@ -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) |
