Index: packages/Python/lldbsuite/test/make/Makefile.rules =================================================================== --- packages/Python/lldbsuite/test/make/Makefile.rules +++ packages/Python/lldbsuite/test/make/Makefile.rules @@ -131,6 +131,7 @@ ARFLAGS := -static -o else AR := $(CROSS_COMPILE)ar + OBJCOPY := $(CROSS_COMPILE)objcopy # On non-Apple platforms, -arch becomes -m ARCHFLAG := -m @@ -161,10 +162,26 @@ override ARCH := $(subst powerpc64,64,$(ARCH)) endif ifeq "$(ARCH)" "aarch64" + OBJCOPY := $(if $(findstring gcc,$(CC)), \ + $(subst gcc,objcopy,$(CC)), \ + $(if $(findstring clang,$(CC)), \ + $(subst clang,objcopy,$(CC)))) + AR := $(if $(findstring gcc,$(CC)), \ + $(subst gcc,ar,$(CC)), \ + $(if $(findstring clang,$(CC)), \ + $(subst clang,ar,$(CC)))) override ARCH := override ARCHFLAG := endif ifeq "$(ARCH)" "arm" + OBJCOPY := $(if $(findstring gcc,$(CC)), \ + $(subst gcc,objcopy,$(CC)), \ + $(if $(findstring clang,$(CC)), \ + $(subst clang,objcopy,$(CC)))) + AR := $(if $(findstring gcc,$(CC)), \ + $(subst gcc,ar,$(CC)), \ + $(if $(findstring clang,$(CC)), \ + $(subst clang,ar,$(CC)))) override ARCH := override ARCHFLAG := endif @@ -260,8 +277,6 @@ $(subst cc,c++,$(1)))))) cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1))) -OBJCOPY := $(CROSS_COMPILE)objcopy - #---------------------------------------------------------------------- # Windows specific options #----------------------------------------------------------------------