Revert rL277429: Correct makefile.rules to use toolchain specific AR and OBJCOPY

This commit is causing problems on gcc-* compiler with version number sufix.

Requires a new solution will post a follow up patch.

Differential revision: https://reviews.llvm.org/D20386

llvm-svn: 277453

diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index fb7bb9e..c37ef74 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -265,6 +265,8 @@ cxx_linker_notdir = $(if $(findstring clang,$(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 := $(CROSS_COMPILE)objcopy
+
 #----------------------------------------------------------------------
 # Windows specific options
 #----------------------------------------------------------------------
@@ -285,25 +287,24 @@ endif
 #----------------------------------------------------------------------
 # Android specific options
 #----------------------------------------------------------------------
-
-ifdef PIE
-    LDFLAGS += -pie
-endif
-
-replace_with = $(if $(findstring clang,$(1)), \
-                    $(subst clang,$(2),$(1)), \
-                    $(if $(findstring gcc,$(1)), \
-                         $(subst gcc,$(2),$(1)), \
-                         $(subst cc,$(2),$(1))))
-ifeq "$(notdir $(CC))" "$(CC)"
-    replace_cc_with = $(call replace_with,$(CC),$(1))
-else
-    replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(notdir $(CC)),$(1)))
+ifeq "$(OS)" "Android"
+    ifdef PIE
+        LDFLAGS += -pie
+    endif
+    replace_with = $(if $(findstring clang,$(1)), \
+                        $(subst clang,$(2),$(1)), \
+                        $(if $(findstring gcc,$(1)), \
+                             $(subst gcc,$(2),$(1)), \
+                             $(subst cc,$(2),$(1))))
+    ifeq "$(notdir $(CC))" "$(CC)"
+        replace_cc_with = $(call replace_with,$(CC),$(1))
+    else
+        replace_cc_with = $(join $(dir $(CC)),$(call replace_with,$(notdir $(CC)),$(1)))
+    endif
+    OBJCOPY = $(call replace_cc_with,objcopy)
+    AR = $(call replace_cc_with,ar)
 endif
 
-OBJCOPY = $(call replace_cc_with,objcopy)
-AR = $(call replace_cc_with,ar)
-
 #----------------------------------------------------------------------
 # C++ standard library options
 #----------------------------------------------------------------------