Use objcopy provided next to the compiler on android

[tberghammer]

Summary

Use objcopy provided next to the compiler on android

[ovyalov]

lgtm

lldb/trunk/test/make/Makefile.rules

cxx_linker_notdir = $(if $(findstring clang,$(1)), \
                               $(subst icc,icpc,$(1)), \
                               $(if $(findstring llvm-gcc,$(1)), \
                                    $(subst llvm-gcc,llvm-g++,$(1)), \
                                    $(if $(findstring gcc,$(1)), \
                                         $(subst gcc,g++,$(1)), \
                                         $(subst cc,c++,$(1))))))
 cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1)))
 
+OBJCOPY = objcopy
+
 #----------------------------------------------------------------------
 # Windows specific options
 #----------------------------------------------------------------------
 ifeq "$(OS)" "Windows_NT"
   ifneq (,$(findstring clang,$(CC)))
     # Clang for Windows doesn't support C++ Exceptions
     CXXFLAGS += -fno-exceptions
     CXXFLAGS += -D_HAS_EXCEPTIONS=0
     # The MSVC linker doesn't understand long section names
     # generated by the clang compiler.
     LDFLAGS += -fuse-ld=lld
   endif
 endif
 
 #----------------------------------------------------------------------
 # Android specific options
 #----------------------------------------------------------------------
 ifeq "$(OS)" "Android"
-  LDFLAGS += -pie
+    objcopy_notdir = $(if $(findstring clang,$(1)), \
+                          $(subst clang,objcopy,$(1)), \
+                               $(if $(findstring gcc,$(1)), \
+                                    $(subst gcc,objcopy,$(1)), \
+                                    $(subst cc,objcopy,$(1))))))
+    objcopy = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call objcopy_notdir,$(notdir $(1)))),$(call objcopy_notdir,$(1)))
+
+    LDFLAGS += -pie
+    OBJCOPY = $(call objcopy $(CC))
 endif
 
 #----------------------------------------------------------------------
 # C++ standard library options
 #----------------------------------------------------------------------
 ifeq (1,$(USE_LIBSTDCPP))
   # Clang requires an extra flag: -stdlib=libstdc++
   ifneq (,$(findstring clang,$(CC)))

 ifneq "$(DYLIB_ONLY)" "YES"
 $(DSYM) : $(EXE)
 ifeq "$(OS)" "Darwin"
 ifneq "$(MAKE_DSYM)" "NO"
   "$(DS)" $(DSFLAGS) -o "$(DSYM)" "$(EXE)"
 endif
 else
 ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
-  objcopy --only-keep-debug "$(EXE)" "$(DSYM)"
-  objcopy --strip-debug --add-gnu-debuglink="$(DSYM)" "$(EXE)" "$(EXE)"
+  $(OBJCOPY) --only-keep-debug "$(EXE)" "$(DSYM)"
+  $(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DSYM)" "$(EXE)" "$(EXE)"
 endif
 endif
 endif
 
 #----------------------------------------------------------------------
 # Compile the executable from all the objects.
 #----------------------------------------------------------------------
 ifneq "$(DYLIB_NAME)" ""

 ifneq "$(MAKE_DSYM)" "NO"
 ifneq "$(DS)" ""
   "$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)"
 endif
 endif
 else
   $(LD) $(LDFLAGS) $(DYLIB_OBJECTS) -shared -o "$(DYLIB_FILENAME)"
 ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
-  objcopy --only-keep-debug "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).debug"
-  objcopy --strip-debug --add-gnu-debuglink="$(DYLIB_FILENAME).debug" "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME)"
+  $(OBJCOPY) --only-keep-debug "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME).debug"
+  $(OBJCOPY) --strip-debug --add-gnu-debuglink="$(DYLIB_FILENAME).debug" "$(DYLIB_FILENAME)" "$(DYLIB_FILENAME)"
 endif
 endif
 
 #----------------------------------------------------------------------
 # Automatic variables based on items already entered. Below we create
 # an object's lists from the list of sources by replacing all entries
 # that end with .c with .o, and we also create a list of prerequisite
 # files by replacing all .c files with .d.